winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
August 2011
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
770 discussions
Start a n
N
ew thread
Grazvydas Ignotas : gdi32: Use correct name for elfFullName.
by Alexandre Julliard
24 Aug '11
24 Aug '11
Module: wine Branch: master Commit: 4a463e06505af991f23b9c2ce47efedaf9738928 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4a463e06505af991f23b9c2ce…
Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Tue Aug 23 23:11:57 2011 +0300 gdi32: Use correct name for elfFullName. --- dlls/gdi32/freetype.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 426dc05..716a37f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4085,7 +4085,7 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpFamilyName), LF_FACESIZE); lstrcpynW(pelf->elfFullName, - (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpFaceName), + (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpFullName), LF_FULLFACESIZE); lstrcpynW(pelf->elfStyle, (WCHAR*)((char*)font->potm + (ULONG_PTR)font->potm->otmpStyleName), @@ -4098,7 +4098,10 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, pntm->ntmTm.ntmSizeEM = pntm->ntmTm.tmHeight - pntm->ntmTm.tmInternalLeading; lstrcpynW(pelf->elfLogFont.lfFaceName, face->family->FamilyName, LF_FACESIZE); - lstrcpynW(pelf->elfFullName, face->family->FamilyName, LF_FULLFACESIZE); + if (face->FullName) + lstrcpynW(pelf->elfFullName, face->FullName, LF_FULLFACESIZE); + else + lstrcpynW(pelf->elfFullName, face->family->FamilyName, LF_FULLFACESIZE); lstrcpynW(pelf->elfStyle, face->StyleName, LF_FACESIZE); }
1
0
0
0
André Hentschel : wininet: Test and fix possible error situations for InternetQueryOption with INTERNET_OPTION_PROXY .
by Alexandre Julliard
24 Aug '11
24 Aug '11
Module: wine Branch: master Commit: 37cdf6bd2609690a42d7c7b8b47a5572290642d7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=37cdf6bd2609690a42d7c7b8b…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 23 21:01:44 2011 +0200 wininet: Test and fix possible error situations for InternetQueryOption with INTERNET_OPTION_PROXY. --- dlls/wininet/internet.c | 1 + dlls/wininet/tests/http.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index cf555c7..79ec790 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -802,6 +802,7 @@ static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffe } case INTERNET_OPTION_PROXY: + if(!size) return ERROR_INVALID_PARAMETER; if (unicode) { INTERNET_PROXY_INFOW *pi = (INTERNET_PROXY_INFOW *)buffer; DWORD proxyBytesRequired = 0, proxyBypassBytesRequired = 0; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 2110dec..f3e85cb 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2697,6 +2697,27 @@ static void test_options(int port) ok(ret, "InternetQueryOption failed %u\n", GetLastError()); ok(ctx == 3, "expected 3 got %lu\n", ctx); + /* INTERNET_OPTION_PROXY */ + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(ses, INTERNET_OPTION_PROXY, NULL, NULL); + error = GetLastError(); + ok(!ret, "InternetQueryOption succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(ses, INTERNET_OPTION_PROXY, &ctx, NULL); + error = GetLastError(); + ok(!ret, "InternetQueryOption succeeded\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + size = 0; + SetLastError(0xdeadbeef); + ret = InternetQueryOptionA(ses, INTERNET_OPTION_PROXY, NULL, &size); + error = GetLastError(); + ok(!ret, "InternetQueryOption succeeded\n"); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(size >= sizeof(INTERNET_PROXY_INFOA), "expected size to be greater or equal to the struct size\n"); + InternetCloseHandle(req); InternetCloseHandle(con); InternetCloseHandle(ses);
1
0
0
0
Robert Millan : configure: Add GNU/kFreeBSD detection.
by Alexandre Julliard
24 Aug '11
24 Aug '11
Module: wine Branch: master Commit: 535a55ec9eff83ac1cdf58a6514f4a76cab46a57 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=535a55ec9eff83ac1cdf58a65…
Author: Robert Millan <rmh(a)debian.org> Date: Tue Aug 23 20:39:45 2011 +0200 configure: Add GNU/kFreeBSD detection. --- configure | 2 +- configure.ac | 2 +- libs/wine/ldt.c | 2 +- tools/winebuild/main.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 1c453cf..1497bdb 100755 --- a/configure +++ b/configure @@ -6854,7 +6854,7 @@ eval ac_res=\$$as_ac_var $as_echo "$ac_res" >&6; } if test `eval 'as_val=${'$as_ac_var'};$as_echo "$as_val"'` = yes; then : case $host_os in - freebsd*) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;; + freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;; *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;; esac diff --git a/configure.ac b/configure.ac index e6bbb2a..11d22b9 100644 --- a/configure.ac +++ b/configure.ac @@ -824,7 +824,7 @@ case $host_os in *i[[3456789]]86* | x86_64) WINE_TRY_CFLAGS([-Wl,--section-start,.interp=0x7bf00400], [case $host_os in - freebsd*) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;; + freebsd* | kfreebsd*-gnu) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x60000400" ;; *) LDEXECFLAGS="$LDEXECFLAGS -Wl,--section-start,.interp=0x7bf00400" ;; esac ]) diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 3098061..4e48b16 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -384,7 +384,7 @@ unsigned short wine_ldt_alloc_fs(void) if (errno != ENOSYS) perror( "set_thread_area" ); } else global_fs_sel = (ldt_info.entry_number << 3) | 3; -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) global_fs_sel = GSEL( GUFS_SEL, SEL_UPL ); #endif } diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 55908d5..0eeeb04 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -65,7 +65,7 @@ enum target_cpu target_cpu = CPU_ARM; #ifdef __APPLE__ enum target_platform target_platform = PLATFORM_APPLE; -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) enum target_platform target_platform = PLATFORM_FREEBSD; #elif defined(__sun) enum target_platform target_platform = PLATFORM_SOLARIS;
1
0
0
0
Henri Verbeet : wined3d: Make the gl_info parameter to wined3d_guess_gl_vendor() const.
by Alexandre Julliard
24 Aug '11
24 Aug '11
Module: wine Branch: master Commit: f80301e3e6cc262ac27221933a607ce9022e446d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f80301e3e6cc262ac27221933…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 23 20:08:14 2011 +0200 wined3d: Make the gl_info parameter to wined3d_guess_gl_vendor() const. --- dlls/wined3d/directx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b9cd3ad..48d27af 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1362,7 +1362,8 @@ static DWORD wined3d_parse_gl_version(const char *gl_version) return MAKEDWORD_VERSION(major, minor); } -static enum wined3d_gl_vendor wined3d_guess_gl_vendor(struct wined3d_gl_info *gl_info, const char *gl_vendor_string, const char *gl_renderer) +static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_info *gl_info, + const char *gl_vendor_string, const char *gl_renderer) { /* MacOS has various specialities in the extensions it advertises. Some have to be loaded from
1
0
0
0
Henri Verbeet : wined3d: Make the ctx parameter to WineD3D_ReleaseFakeGLContext() const.
by Alexandre Julliard
24 Aug '11
24 Aug '11
Module: wine Branch: master Commit: a88611210fc96859b8c3250fc197c8c54c8f016d URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a88611210fc96859b8c3250fc…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 23 20:08:13 2011 +0200 wined3d: Make the ctx parameter to WineD3D_ReleaseFakeGLContext() const. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7a659ee..b9cd3ad 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -261,7 +261,7 @@ struct wined3d_fake_gl_ctx HGLRC restore_gl_ctx; }; -static void WineD3D_ReleaseFakeGLContext(struct wined3d_fake_gl_ctx *ctx) +static void WineD3D_ReleaseFakeGLContext(const struct wined3d_fake_gl_ctx *ctx) { TRACE_(d3d_caps)("Destroying fake GL context.\n");
1
0
0
0
Henri Verbeet : wined3d: Make the device parameter to drawStridedSlow() const.
by Alexandre Julliard
24 Aug '11
24 Aug '11
Module: wine Branch: master Commit: 22f5d0081f374d3774a1f57dfc5dfe8f7fe4c150 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=22f5d0081f374d3774a1f57df…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 23 20:08:12 2011 +0200 wined3d: Make the device parameter to drawStridedSlow() const. --- dlls/wined3d/drawprim.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index ea2dd8f..dde71b4 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -65,7 +65,7 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit */ /* GL locking is done by the caller */ -static void drawStridedSlow(struct wined3d_device *device, const struct wined3d_context *context, +static void drawStridedSlow(const struct wined3d_device *device, const struct wined3d_context *context, const struct wined3d_stream_info *si, UINT NumVertexes, GLenum glPrimType, const void *idxData, UINT idxSize, UINT startIdx) {
1
0
0
0
Henri Verbeet : wined3d: Use draw_binding in wined3d_surface_blt().
by Alexandre Julliard
24 Aug '11
24 Aug '11
Module: wine Branch: master Commit: 4673330cf41e1a92b9c335f08430a4d1dedbeeea URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4673330cf41e1a92b9c335f08…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 23 20:08:11 2011 +0200 wined3d: Use draw_binding in wined3d_surface_blt(). --- dlls/wined3d/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cc581d2..dea13f8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1686,9 +1686,9 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC TRACE("Using FBO blit.\n"); surface_blt_fbo(device, filter, - src_surface, SFLAG_INDRAWABLE, &src_rect, - dst_surface, SFLAG_INDRAWABLE, &dst_rect); - surface_modify_location(dst_surface, SFLAG_INDRAWABLE, TRUE); + src_surface, src_surface->draw_binding, &src_rect, + dst_surface, dst_surface->draw_binding, &dst_rect); + surface_modify_location(dst_surface, dst_surface->draw_binding, TRUE); return WINED3D_OK; }
1
0
0
0
Henri Verbeet : wined3d: Use draw_binding in device_clear_render_targets().
by Alexandre Julliard
24 Aug '11
24 Aug '11
Module: wine Branch: master Commit: 99da66429b349831213e0722022bea693598ead6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=99da66429b349831213e07220…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 23 20:08:10 2011 +0200 wined3d: Use draw_binding in device_clear_render_targets(). --- dlls/wined3d/device.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cdc1827..3a3692b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -668,7 +668,9 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count { for (i = 0; i < rt_count; ++i) { - if (fb->render_targets[i]) surface_load_location(fb->render_targets[i], SFLAG_INDRAWABLE, NULL); + struct wined3d_surface *rt = fb->render_targets[i]; + if (rt) + surface_load_location(rt, rt->draw_binding, NULL); } } @@ -727,7 +729,7 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count if (flags & WINED3DCLEAR_ZBUFFER) { - surface_modify_location(fb->depth_stencil, SFLAG_INDRAWABLE, TRUE); + surface_modify_location(fb->depth_stencil, fb->depth_stencil->draw_binding, TRUE); glDepthMask(GL_TRUE); context_invalidate_state(context, STATE_RENDER(WINED3DRS_ZWRITEENABLE)); @@ -740,7 +742,10 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count { for (i = 0; i < rt_count; ++i) { - if (fb->render_targets[i]) surface_modify_location(fb->render_targets[i], SFLAG_INDRAWABLE, TRUE); + struct wined3d_surface *rt = fb->render_targets[i]; + + if (rt) + surface_modify_location(rt, rt->draw_binding, TRUE); } glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
1
0
0
0
Henri Verbeet : wined3d: Use draw_binding in arbfp_blit_surface().
by Alexandre Julliard
24 Aug '11
24 Aug '11
Module: wine Branch: master Commit: 317d76abb4a4ce227643c491dbee190c17c12413 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=317d76abb4a4ce227643c491d…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 23 20:08:09 2011 +0200 wined3d: Use draw_binding in arbfp_blit_surface(). --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 24c0ff2..1d5b0c4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7247,7 +7247,7 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, context_release(context); - surface_modify_location(dst_surface, SFLAG_INDRAWABLE, TRUE); + surface_modify_location(dst_surface, dst_surface->draw_binding, TRUE); return WINED3D_OK; }
1
0
0
0
Henri Verbeet : wined3d: Keep track of a surface's "draw location".
by Alexandre Julliard
24 Aug '11
24 Aug '11
Module: wine Branch: master Commit: e57b20c21508140f75fb9b791659cb066d3010bb URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e57b20c21508140f75fb9b791…
Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 23 20:08:08 2011 +0200 wined3d: Keep track of a surface's "draw location". --- dlls/wined3d/context.c | 1 + dlls/wined3d/device.c | 1 + dlls/wined3d/drawprim.c | 6 +++--- dlls/wined3d/surface.c | 9 +++++++++ dlls/wined3d/swapchain.c | 13 +++++++++++++ dlls/wined3d/wined3d_private.h | 3 +++ 6 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9a67536..42d26bc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1930,6 +1930,7 @@ static void context_validate_onscreen_formats(struct wined3d_context *context, /* The currently active context is the necessary context to access the swapchain's onscreen buffers */ surface_load_location(context->current_rt, SFLAG_INTEXTURE, NULL); swapchain->render_to_fbo = TRUE; + swapchain_update_draw_bindings(swapchain); context_set_render_offscreen(context, TRUE); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 39219bf..cdc1827 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5880,6 +5880,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, stateblock_init_default_state(device->stateBlock); swapchain_update_render_to_fbo(swapchain); + swapchain_update_draw_bindings(swapchain); hr = create_primary_opengl_context(device, swapchain); wined3d_swapchain_decref(swapchain); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 5f2198e..ea2dd8f 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -591,8 +591,8 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId struct wined3d_surface *target = device->fb.render_targets[i]; if (target) { - surface_load_location(target, SFLAG_INDRAWABLE, NULL); - surface_modify_location(target, SFLAG_INDRAWABLE, TRUE); + surface_load_location(target, target->draw_binding, NULL); + surface_modify_location(target, target->draw_binding, TRUE); } } } @@ -638,7 +638,7 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId if (state->render_states[WINED3DRS_ZWRITEENABLE]) { surface_modify_ds_location(ds, location, ds->ds_current_size.cx, ds->ds_current_size.cy); - surface_modify_location(ds, SFLAG_INDRAWABLE, TRUE); + surface_modify_location(ds, ds->draw_binding, TRUE); } } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3cd424e..cc581d2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -100,6 +100,14 @@ static void surface_cleanup(struct wined3d_surface *surface) resource_cleanup(&surface->resource); } +void surface_update_draw_binding(struct wined3d_surface *surface) +{ + if (!surface_is_offscreen(surface) || wined3d_settings.offscreen_rendering_mode != ORM_FBO) + surface->draw_binding = SFLAG_INDRAWABLE; + else + surface->draw_binding = SFLAG_INTEXTURE; +} + void surface_set_container(struct wined3d_surface *surface, enum wined3d_container_type type, void *container) { TRACE("surface %p, container %p.\n", surface, container); @@ -131,6 +139,7 @@ void surface_set_container(struct wined3d_surface *surface, enum wined3d_contain surface->container.type = type; surface->container.u.base = container; + surface_update_draw_binding(surface); } struct blt_info diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6edb043..20c2323 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -518,6 +518,7 @@ static HRESULT swapchain_gl_present(struct wined3d_swapchain *swapchain, const R surface_load_location(swapchain->back_buffers[0], SFLAG_INTEXTURE, NULL); surface_modify_location(swapchain->back_buffers[0], SFLAG_INDRAWABLE, FALSE); swapchain->render_to_fbo = TRUE; + swapchain_update_draw_bindings(swapchain); } if (swapchain->render_to_fbo) @@ -1245,3 +1246,15 @@ HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) return swapchain->backup_dc; } + +void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) +{ + UINT i; + + surface_update_draw_binding(swapchain->front_buffer); + + for (i = 0; i < swapchain->presentParms.BackBufferCount; ++i) + { + surface_update_draw_binding(swapchain->back_buffers[i]); + } +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 80517e3..754d49e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1996,6 +1996,7 @@ struct wined3d_surface struct wined3d_subresource_container container; struct wined3d_palette *palette; /* D3D7 style palette handling */ PALETTEENTRY *palette9; /* D3D8/9 style palette handling */ + DWORD draw_binding; DWORD flags; @@ -2080,6 +2081,7 @@ void surface_set_container(struct wined3d_surface *surface, void surface_set_texture_name(struct wined3d_surface *surface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN; void surface_set_texture_target(struct wined3d_surface *surface, GLenum target) DECLSPEC_HIDDEN; void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; +void surface_update_draw_binding(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void surface_upload_data(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const struct wined3d_format *format, const RECT *src_rect, UINT src_w, const POINT *dst_point, BOOL srgb, const struct wined3d_bo_address *data) DECLSPEC_HIDDEN; @@ -2442,6 +2444,7 @@ void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *r struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; HDC swapchain_get_backup_dc(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_update_render_to_fbo(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; #define DEFAULT_REFRESH_RATE 0
1
0
0
0
← Newer
1
...
30
31
32
33
34
35
36
...
77
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
Results per page:
10
25
50
100
200