February 2008 - Wine-commits

Stefan Dösinger : wined3d: Create a VBO before returning memory.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: e40bb4a8c3bffba1b5d429508e8fa4cd3cbc3186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e40bb4a8c3bffba1b5d429508… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 11 12:46:43 2008 +0100 wined3d: Create a VBO before returning memory. The state manager calls GetMemory before it calls PreLoad on the VBO, and PreLoad depends on finding the VBO in the strided vertex structure. This can cause problems on the first draw which creates the vertex buffer, because the first PreLoad creates the vbo and attempts to convert with an incorrect strided structure. --- dlls/wined3d/vertexbuffer.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 72cef07..985ac35 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -801,6 +801,14 @@ BYTE* WINAPI IWineD3DVertexBufferImpl_GetMemory(IWineD3DVertexBuffer* iface, DWO *vbo = This->vbo; if(This->vbo == 0) { + if(This->Flags & VBFLAG_CREATEVBO) { + CreateVBO(This); + This->Flags &= ~VBFLAG_CREATEVBO; + if(This->vbo) { + *vbo = This->vbo; + return (BYTE *) iOffset; + } + } return This->resource.allocatedMemory + iOffset; } else { return (BYTE *) iOffset;

1 0

Stefan Dösinger : wined3d: Enable the texcoord init workaround on radeon HD cards on MacOS.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: f952419651bf15e5daef4362ea5c455b66cd3698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f952419651bf15e5daef4362e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Feb 14 18:38:02 2008 +0100 wined3d: Enable the texcoord init workaround on radeon HD cards on MacOS. --- dlls/wined3d/directx.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c9c3e68..c3afa7f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3024,8 +3024,14 @@ static void fixup_extensions(WineD3D_GL_Info *gl_info) { * * We don't want to enable this on all cards, as it adds an extra instruction per texcoord used. This * makes the shader slower and eats instruction slots which should be available to the d3d app. + * + * ATI Radeon HD 2xxx cards on MacOS have the issue. Instead of checking for the buggy cards blacklist + * all radeon cards on Macs but whitelist the good ones, that way we're prepared for the future. If + * this workaround is activated on cards that do not need it it won't break things, just affect + * performance negatively */ - if(gl_info->gl_vendor == VENDOR_INTEL) { + if(gl_info->gl_vendor == VENDOR_INTEL || + (gl_info->gl_vendor == VENDOR_ATI && gl_info->gl_card != CARD_ATI_RADEON_X1600)) { TRACE("Enabling vertex texture coord fixes in vertex shaders\n"); gl_info->set_texcoord_w = TRUE; }

1 0

Tony Wasserka : d3dx9: Start implementation of d3dx9_32, d3dx9_33, d3dx9_34 and d3dx9_35.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: df0a694f9e3c18e869238f943a3882e4c022a120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df0a694f9e3c18e869238f943… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sat Feb 2 19:02:34 2008 +0100 d3dx9: Start implementation of d3dx9_32, d3dx9_33, d3dx9_34 and d3dx9_35. --- Makefile.in | 8 + configure | 12 ++ configure.ac | 4 + dlls/Makefile.in | 4 + dlls/d3dx9_32/Makefile.in | 13 ++ dlls/d3dx9_32/d3dx9_32.spec | 334 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_32/d3dx9_32_main.c | 53 +++++++ dlls/d3dx9_33/Makefile.in | 13 ++ dlls/d3dx9_33/d3dx9_33.spec | 334 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_33/d3dx9_33_main.c | 53 +++++++ dlls/d3dx9_34/Makefile.in | 13 ++ dlls/d3dx9_34/d3dx9_34.spec | 334 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_34/d3dx9_34_main.c | 53 +++++++ dlls/d3dx9_35/Makefile.in | 13 ++ dlls/d3dx9_35/d3dx9_35.spec | 334 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_35/d3dx9_35_main.c | 53 +++++++ 16 files changed, 1628 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=df0a694f9e3c18e869238…

1 0

Tony Wasserka : d3dx9.h: Include d3dx9math.h before d3dx9core.h.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 7666315c37139e501784a4acb1ae512859edd6f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7666315c37139e501784a4acb… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Tue Feb 5 14:27:52 2008 +0100 d3dx9.h: Include d3dx9math.h before d3dx9core.h. --- include/d3dx9.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3dx9.h b/include/d3dx9.h index 62319ec..5d9fd5f 100644 --- a/include/d3dx9.h +++ b/include/d3dx9.h @@ -22,7 +22,7 @@ #include <limits.h> #include "d3d9.h" -#include "d3dx9core.h" #include "d3dx9math.h" +#include "d3dx9core.h" #endif

1 0

Tony Wasserka : d3dx9: Complete d3dx9core.h.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: b1dab9e5a56f609e8b770379d27195e7ec920d9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1dab9e5a56f609e8b770379d… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Mon Feb 4 17:24:54 2008 +0100 d3dx9: Complete d3dx9core.h. --- include/d3dx9core.h | 474 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 471 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1dab9e5a56f609e8b770…

1 0

Tony Wasserka : d3dx9: Start implementation of d3dx9_26 and d3dx9_27.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 409b19b910a78869bf83106c65f8c84f31af5e4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=409b19b910a78869bf83106c6… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sat Feb 2 18:06:52 2008 +0100 d3dx9: Start implementation of d3dx9_26 and d3dx9_27. --- Makefile.in | 4 + configure | 6 + configure.ac | 2 + dlls/Makefile.in | 2 + dlls/d3dx9_26/Makefile.in | 13 ++ dlls/d3dx9_26/d3dx9_26.spec | 327 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_26/d3dx9_26_main.c | 53 +++++++ dlls/d3dx9_27/Makefile.in | 13 ++ dlls/d3dx9_27/d3dx9_27.spec | 327 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_27/d3dx9_27_main.c | 53 +++++++ 10 files changed, 800 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=409b19b910a78869bf831…

1 0

Tony Wasserka : d3dx9: Start implementation of d3dx9_28, d3dx9_29 and d3dx9_30.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 2aa1505ab3df95c99d6c5c51085818d3fa042137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aa1505ab3df95c99d6c5c510… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sat Feb 2 18:29:07 2008 +0100 d3dx9: Start implementation of d3dx9_28, d3dx9_29 and d3dx9_30. --- Makefile.in | 6 + configure | 9 + configure.ac | 3 + dlls/Makefile.in | 3 + dlls/d3dx9_28/Makefile.in | 13 ++ dlls/d3dx9_28/d3dx9_28.spec | 332 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_28/d3dx9_28_main.c | 53 +++++++ dlls/d3dx9_29/Makefile.in | 13 ++ dlls/d3dx9_29/d3dx9_29.spec | 332 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_29/d3dx9_29_main.c | 53 +++++++ dlls/d3dx9_30/Makefile.in | 13 ++ dlls/d3dx9_30/d3dx9_30.spec | 332 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_30/d3dx9_30_main.c | 53 +++++++ 13 files changed, 1215 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2aa1505ab3df95c99d6c5…

1 0

Tony Wasserka : d3dx9: Start implementation of d3dx9_31.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: e4866622cbf700394dd6e6f6cb9e7d540801cc88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4866622cbf700394dd6e6f6c… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sat Feb 2 18:35:38 2008 +0100 d3dx9: Start implementation of d3dx9_31. --- Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/d3dx9_31/Makefile.in | 13 ++ dlls/d3dx9_31/d3dx9_31.spec | 329 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_31/d3dx9_31_main.c | 53 +++++++ 7 files changed, 402 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e4866622cbf700394dd6e…

1 0

Tony Wasserka : d3dx9: Start implementation of d3dx9_24.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: 6f834d353c109a8aeaac4807ace91ba002a51285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f834d353c109a8aeaac4807a… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sat Feb 2 10:24:28 2008 +0100 d3dx9: Start implementation of d3dx9_24. --- Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/d3dx9_24/Makefile.in | 13 ++ dlls/d3dx9_24/d3dx9_24.spec | 320 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_24/d3dx9_24_main.c | 53 +++++++ 7 files changed, 393 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f834d353c109a8aeaac4…

1 0

Tony Wasserka : d3dx9: Start implementation of d3dx9_25.
by Alexandre Julliard 19 Feb '08

19 Feb '08

Module: wine Branch: master Commit: e9c16391c24d1f0c01c7e7a0a6eaa55bcc4ec5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9c16391c24d1f0c01c7e7a0a… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Sat Feb 2 16:22:27 2008 +0100 d3dx9: Start implementation of d3dx9_25. --- Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 1 + dlls/d3dx9_25/Makefile.in | 13 ++ dlls/d3dx9_25/d3dx9_25.spec | 323 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_25/d3dx9_25_main.c | 53 +++++++ 7 files changed, 396 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9c16391c24d1f0c01c7e…

1 0