May 2007 - Wine-Commits - list.winehq.org

H. Verbeet : wined3d: Load texture coordinates even if no texture is bound to that stage at this time .
by Alexandre Julliard May 10, 2007

May 10, 2007

Module: wine Branch: master Commit: 79ca4e022d593ec6106bad1e1ffde7b8c31ad01b URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ca4e022d593ec6106bad1e1… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed May 9 19:08:27 2007 +0200 wined3d: Load texture coordinates even if no texture is bound to that stage at this time. --- dlls/wined3d/state.c | 63 +++++++++++++++++++++++--------------------------- 1 files changed, 29 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c0643a2..ba25501 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1825,46 +1825,41 @@ static void loadTexCoords(IWineD3DStateBlockImpl *stateblock, WineDirect3DVertex unsigned int mapped_stage = 0; unsigned int textureNo = 0; + /* The code below uses glClientActiveTexture and glMultiTexCoord* which are all part of the GL_ARB_multitexture extension. */ + /* Abort if we don't support the extension. */ + if (!GL_SUPPORT(ARB_MULTITEXTURE)) { + FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); + return; + } + for (textureNo = 0; textureNo < GL_LIMITS(texture_stages); ++textureNo) { - /* The code below uses glClientActiveTexture and glMultiTexCoord* which are all part of the GL_ARB_multitexture extension. */ - /* Abort if we don't support the extension. */ - if (!GL_SUPPORT(ARB_MULTITEXTURE)) { - FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); - continue; - } + int coordIdx = stateblock->textureState[textureNo][WINED3DTSS_TEXCOORDINDEX]; - if (stateblock->textures[textureNo]) { - int coordIdx = stateblock->textureState[textureNo][WINED3DTSS_TEXCOORDINDEX]; + mapped_stage = stateblock->wineD3DDevice->texUnitMap[textureNo]; + if (mapped_stage == -1) continue; + + if (coordIdx < MAX_TEXTURES && (sd->u.s.texCoords[coordIdx].lpData || sd->u.s.texCoords[coordIdx].VBO)) { + TRACE("Setting up texture %u, idx %d, cordindx %u, data %p\n", + textureNo, mapped_stage, coordIdx, sd->u.s.texCoords[coordIdx].lpData); + + if (*curVBO != sd->u.s.texCoords[coordIdx].VBO) { + GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, sd->u.s.texCoords[coordIdx].VBO)); + checkGLcall("glBindBufferARB"); + *curVBO = sd->u.s.texCoords[coordIdx].VBO; + } - mapped_stage = stateblock->wineD3DDevice->texUnitMap[textureNo]; - /* The gl texture unit will never be -1 for a bound texture */ GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); checkGLcall("glClientActiveTextureARB"); - if (coordIdx >= MAX_TEXTURES) { - VTRACE(("tex: %d - Skip tex coords, as being system generated\n", textureNo)); - GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + mapped_stage, 0, 0, 0, 1)); - } else if (sd->u.s.texCoords[coordIdx].lpData == NULL && sd->u.s.texCoords[coordIdx].VBO == 0) { - VTRACE(("Bound texture but no texture coordinates supplied, so skipping\n")); - GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + mapped_stage, 0, 0, 0, 1)); - } else { - TRACE("Setting up texture %u, idx %d, cordindx %u, data %p\n", - textureNo, mapped_stage, coordIdx, sd->u.s.texCoords[coordIdx].lpData); - if (*curVBO != sd->u.s.texCoords[coordIdx].VBO) { - GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, sd->u.s.texCoords[coordIdx].VBO)); - checkGLcall("glBindBufferARB"); - *curVBO = sd->u.s.texCoords[coordIdx].VBO; - } - /* The coords to supply depend completely on the fvf / vertex shader */ - glTexCoordPointer( - WINED3D_ATR_SIZE(sd->u.s.texCoords[coordIdx].dwType), - WINED3D_ATR_GLTYPE(sd->u.s.texCoords[coordIdx].dwType), - sd->u.s.texCoords[coordIdx].dwStride, - sd->u.s.texCoords[coordIdx].lpData + stateblock->loadBaseVertexIndex * sd->u.s.texCoords[coordIdx].dwStride + offset[sd->u.s.texCoords[coordIdx].streamNo]); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - } - } else if (!GL_SUPPORT(NV_REGISTER_COMBINERS)) { - GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + textureNo, 0, 0, 0, 1)); + /* The coords to supply depend completely on the fvf / vertex shader */ + glTexCoordPointer( + WINED3D_ATR_SIZE(sd->u.s.texCoords[coordIdx].dwType), + WINED3D_ATR_GLTYPE(sd->u.s.texCoords[coordIdx].dwType), + sd->u.s.texCoords[coordIdx].dwStride, + sd->u.s.texCoords[coordIdx].lpData + stateblock->loadBaseVertexIndex * sd->u.s.texCoords[coordIdx].dwStride + offset[sd->u.s.texCoords[coordIdx].streamNo]); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + } else { + GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + mapped_stage, 0, 0, 0, 1)); } } if (GL_SUPPORT(NV_REGISTER_COMBINERS)) {

1 0

H. Verbeet : wined3d: Split texture coordinate loading from loadVertexData( ).
by Alexandre Julliard May 10, 2007

May 10, 2007

Module: wine Branch: master Commit: cde60c0b94fd5a28b7754986063e525d2e8a7d5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde60c0b94fd5a28b77549860… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed May 9 19:08:10 2007 +0200 wined3d: Split texture coordinate loading from loadVertexData(). --- dlls/wined3d/state.c | 130 +++++++++++++++++++++++++++----------------------- 1 files changed, 70 insertions(+), 60 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 062e5f7..c0643a2 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1811,7 +1811,69 @@ static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock, W } -static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVertexStridedData *sd); +static void unloadTexCoords(IWineD3DStateBlockImpl *stateblock) { + int texture_idx; + + for (texture_idx = 0; texture_idx < GL_LIMITS(textures); ++texture_idx) { + GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + texture_idx)); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); + } +} + +static void loadTexCoords(IWineD3DStateBlockImpl *stateblock, WineDirect3DVertexStridedData *sd, GLint *curVBO) { + UINT *offset = stateblock->streamOffset; + unsigned int mapped_stage = 0; + unsigned int textureNo = 0; + + for (textureNo = 0; textureNo < GL_LIMITS(texture_stages); ++textureNo) { + /* The code below uses glClientActiveTexture and glMultiTexCoord* which are all part of the GL_ARB_multitexture extension. */ + /* Abort if we don't support the extension. */ + if (!GL_SUPPORT(ARB_MULTITEXTURE)) { + FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); + continue; + } + + if (stateblock->textures[textureNo]) { + int coordIdx = stateblock->textureState[textureNo][WINED3DTSS_TEXCOORDINDEX]; + + mapped_stage = stateblock->wineD3DDevice->texUnitMap[textureNo]; + /* The gl texture unit will never be -1 for a bound texture */ + GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); + checkGLcall("glClientActiveTextureARB"); + + if (coordIdx >= MAX_TEXTURES) { + VTRACE(("tex: %d - Skip tex coords, as being system generated\n", textureNo)); + GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + mapped_stage, 0, 0, 0, 1)); + } else if (sd->u.s.texCoords[coordIdx].lpData == NULL && sd->u.s.texCoords[coordIdx].VBO == 0) { + VTRACE(("Bound texture but no texture coordinates supplied, so skipping\n")); + GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + mapped_stage, 0, 0, 0, 1)); + } else { + TRACE("Setting up texture %u, idx %d, cordindx %u, data %p\n", + textureNo, mapped_stage, coordIdx, sd->u.s.texCoords[coordIdx].lpData); + if (*curVBO != sd->u.s.texCoords[coordIdx].VBO) { + GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, sd->u.s.texCoords[coordIdx].VBO)); + checkGLcall("glBindBufferARB"); + *curVBO = sd->u.s.texCoords[coordIdx].VBO; + } + /* The coords to supply depend completely on the fvf / vertex shader */ + glTexCoordPointer( + WINED3D_ATR_SIZE(sd->u.s.texCoords[coordIdx].dwType), + WINED3D_ATR_GLTYPE(sd->u.s.texCoords[coordIdx].dwType), + sd->u.s.texCoords[coordIdx].dwStride, + sd->u.s.texCoords[coordIdx].lpData + stateblock->loadBaseVertexIndex * sd->u.s.texCoords[coordIdx].dwStride + offset[sd->u.s.texCoords[coordIdx].streamNo]); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + } + } else if (!GL_SUPPORT(NV_REGISTER_COMBINERS)) { + GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + textureNo, 0, 0, 0, 1)); + } + } + if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { + /* The number of the mapped stages increases monotonically, so it's fine to use the last used one */ + for (textureNo = mapped_stage + 1; textureNo < GL_LIMITS(textures); ++textureNo) { + GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + textureNo, 0, 0, 0, 1)); + } + } +} static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; @@ -1983,11 +2045,14 @@ static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine if(!isStateDirty(context, STATE_VDECL) && context->namedArraysLoaded) { /* Reload the arrays if we are using fixed function arrays to reflect the selected coord input - * source. Call loadVertexData directly because there is no need to reparse the vertex declaration + * source. Call loadTexCoords directly because there is no need to reparse the vertex declaration * and do all the things linked to it * TODO: Tidy that up to reload only the arrays of the changed unit */ - loadVertexData(stateblock, &stateblock->wineD3DDevice->strided_streams); + GLint curVBO = GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT) ? -1 : 0; + + unloadTexCoords(stateblock); + loadTexCoords(stateblock, &stateblock->wineD3DDevice->strided_streams, &curVBO); } } @@ -2528,8 +2593,6 @@ static void transform_projection(DWORD state, IWineD3DStateBlockImpl *stateblock * TODO: Only load / unload arrays if we have to. */ static inline void unloadVertexData(IWineD3DStateBlockImpl *stateblock) { - int texture_idx; - glDisableClientState(GL_VERTEX_ARRAY); glDisableClientState(GL_NORMAL_ARRAY); glDisableClientState(GL_COLOR_ARRAY); @@ -2541,10 +2604,7 @@ static inline void unloadVertexData(IWineD3DStateBlockImpl *stateblock) { } else if (GL_SUPPORT(EXT_VERTEX_WEIGHTING)) { glDisableClientState(GL_VERTEX_WEIGHT_ARRAY_EXT); } - for (texture_idx = 0; texture_idx < GL_LIMITS(textures); ++texture_idx) { - GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + texture_idx)); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); - } + unloadTexCoords(stateblock); } /* This should match any arrays loaded in loadNumberedArrays @@ -2691,10 +2751,8 @@ static inline void loadNumberedArrays(IWineD3DStateBlockImpl *stateblock, WineDi /* Used from 2 different functions, and too big to justify making it inlined */ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVertexStridedData *sd) { - unsigned int textureNo = 0; UINT *offset = stateblock->streamOffset; GLint curVBO = GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT) ? -1 : 0; - unsigned int mapped_stage = 0; TRACE("Using fast vertex array code\n"); @@ -2967,55 +3025,7 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte } /* Texture coords -------------------------------------------*/ - - for (textureNo = 0; textureNo < GL_LIMITS(texture_stages); ++textureNo) { - /* The code below uses glClientActiveTexture and glMultiTexCoord* which are all part of the GL_ARB_multitexture extension. */ - /* Abort if we don't support the extension. */ - if (!GL_SUPPORT(ARB_MULTITEXTURE)) { - FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); - continue; - } - - if (stateblock->textures[textureNo] != NULL) { - int coordIdx = stateblock->textureState[textureNo][WINED3DTSS_TEXCOORDINDEX]; - - mapped_stage = stateblock->wineD3DDevice->texUnitMap[textureNo]; - /* The gl texture unit will never be -1 for a bound texture */ - GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); - checkGLcall("glClientActiveTextureARB"); - - if (coordIdx >= MAX_TEXTURES) { - VTRACE(("tex: %d - Skip tex coords, as being system generated\n", textureNo)); - GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + mapped_stage, 0, 0, 0, 1)); - } else if (sd->u.s.texCoords[coordIdx].lpData == NULL && sd->u.s.texCoords[coordIdx].VBO == 0) { - VTRACE(("Bound texture but no texture coordinates supplied, so skipping\n")); - GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + mapped_stage, 0, 0, 0, 1)); - } else { - TRACE("Setting up texture %u, idx %d, cordindx %u, data %p\n", - textureNo, mapped_stage, coordIdx, sd->u.s.texCoords[coordIdx].lpData); - if(curVBO != sd->u.s.texCoords[coordIdx].VBO) { - GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, sd->u.s.texCoords[coordIdx].VBO)); - checkGLcall("glBindBufferARB"); - curVBO = sd->u.s.texCoords[coordIdx].VBO; - } - /* The coords to supply depend completely on the fvf / vertex shader */ - glTexCoordPointer( - WINED3D_ATR_SIZE(sd->u.s.texCoords[coordIdx].dwType), - WINED3D_ATR_GLTYPE(sd->u.s.texCoords[coordIdx].dwType), - sd->u.s.texCoords[coordIdx].dwStride, - sd->u.s.texCoords[coordIdx].lpData + stateblock->loadBaseVertexIndex * sd->u.s.texCoords[coordIdx].dwStride + offset[sd->u.s.texCoords[coordIdx].streamNo]); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - } - } else if (!GL_SUPPORT(NV_REGISTER_COMBINERS)) { - GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + textureNo, 0, 0, 0, 1)); - } - } - if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { - /* The number of the mapped stages increases monotonically, so it's fine to use the last used one */ - for (textureNo = mapped_stage + 1; textureNo < GL_LIMITS(textures); ++textureNo) { - GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + textureNo, 0, 0, 0, 1)); - } - } + loadTexCoords(stateblock, sd, &curVBO); } static inline void drawPrimitiveTraceDataLocations(

1 0

H. Verbeet : wined3d: Calling glDisableClientState() from loadVertexData() is redundant.
by Alexandre Julliard May 10, 2007

May 10, 2007

Module: wine Branch: master Commit: 5188ab4efaa103f1bbf28ef5a973434d99316c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5188ab4efaa103f1bbf28ef5a… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed May 9 19:07:48 2007 +0200 wined3d: Calling glDisableClientState() from loadVertexData() is redundant. unloadVertexData() will already have done this if necessary. --- dlls/wined3d/state.c | 26 -------------------------- 1 files changed, 0 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 281f8bb..062e5f7 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2763,15 +2763,8 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte } else { if (GL_SUPPORT(ARB_VERTEX_BLEND)) { static const GLbyte one = 1; - glDisableClientState(GL_WEIGHT_ARRAY_ARB); - checkGLcall("glEnableClientState(GL_WEIGHT_ARRAY_ARB)"); GL_EXTCALL(glWeightbvARB(1, &one)); checkGLcall("glWeightivARB(GL_LIMITS(blends), weights)"); - } else if (GL_SUPPORT(EXT_VERTEX_WEIGHTING)) { - TRACE(" EXT_VERTEX_WEIGHTING\n"); - glDisableClientState(GL_VERTEX_WEIGHT_ARRAY_EXT); - checkGLcall("glDisableClientState(GL_VERTEX_WEIGHT_ARRAY_EXT)"); - } } @@ -2879,10 +2872,6 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte checkGLcall("glVertexPointer(...)"); glEnableClientState(GL_VERTEX_ARRAY); checkGLcall("glEnableClientState(GL_VERTEX_ARRAY)"); - - } else { - glDisableClientState(GL_VERTEX_ARRAY); - checkGLcall("glDisableClientState(GL_VERTEX_ARRAY)"); } /* Normals -------------------------------------------------*/ @@ -2905,8 +2894,6 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte checkGLcall("glEnableClientState(GL_NORMAL_ARRAY)"); } else { - glDisableClientState(GL_NORMAL_ARRAY); - checkGLcall("glDisableClientState(GL_NORMAL_ARRAY)"); glNormal3f(0, 0, 1); checkGLcall("glNormal3f(0, 0, 1)"); } @@ -2939,8 +2926,6 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte checkGLcall("glEnableClientState(GL_COLOR_ARRAY)"); } else { - glDisableClientState(GL_COLOR_ARRAY); - checkGLcall("glDisableClientState(GL_COLOR_ARRAY)"); glColor4f(1.0f, 1.0f, 1.0f, 1.0f); checkGLcall("glColor4f(1, 1, 1, 1)"); } @@ -2972,9 +2957,6 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte } else { if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { - - glDisableClientState(GL_SECONDARY_COLOR_ARRAY_EXT); - checkGLcall("glDisableClientState(GL_SECONDARY_COLOR_ARRAY_EXT)"); GL_EXTCALL(glSecondaryColor3fEXT)(0, 0, 0); checkGLcall("glSecondaryColor3fEXT(0, 0, 0)"); } else { @@ -3004,14 +2986,10 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte if (coordIdx >= MAX_TEXTURES) { VTRACE(("tex: %d - Skip tex coords, as being system generated\n", textureNo)); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + mapped_stage, 0, 0, 0, 1)); - } else if (sd->u.s.texCoords[coordIdx].lpData == NULL && sd->u.s.texCoords[coordIdx].VBO == 0) { VTRACE(("Bound texture but no texture coordinates supplied, so skipping\n")); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + mapped_stage, 0, 0, 0, 1)); - } else { TRACE("Setting up texture %u, idx %d, cordindx %u, data %p\n", textureNo, mapped_stage, coordIdx, sd->u.s.texCoords[coordIdx].lpData); @@ -3029,16 +3007,12 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte glEnableClientState(GL_TEXTURE_COORD_ARRAY); } } else if (!GL_SUPPORT(NV_REGISTER_COMBINERS)) { - GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + textureNo)); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + textureNo, 0, 0, 0, 1)); } } if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { /* The number of the mapped stages increases monotonically, so it's fine to use the last used one */ for (textureNo = mapped_stage + 1; textureNo < GL_LIMITS(textures); ++textureNo) { - GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + textureNo)); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + textureNo, 0, 0, 0, 1)); } }

1 0

Andrew Talbot : mlang: Exclude unused headers.
by Alexandre Julliard May 10, 2007

May 10, 2007

Module: wine Branch: master Commit: 303aeee4cb159366bb15ff1fef8afc710ac7f22b URL: http://source.winehq.org/git/wine.git/?a=commit;h=303aeee4cb159366bb15ff1fe… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed May 9 20:33:44 2007 +0100 mlang: Exclude unused headers. --- dlls/mlang/mlang.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 8c20bc4..8133744 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -31,12 +31,9 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winreg.h" #include "ole2.h" #include "mlang.h" -#include "uuids.h" - #include "wine/unicode.h" #include "wine/debug.h"

1 0

Andrew Talbot : msacm32: Exclude unused headers.
by Alexandre Julliard May 10, 2007

May 10, 2007

Module: wine Branch: master Commit: a0436e828b70f237ed99b7d5446049d9f70e17e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0436e828b70f237ed99b7d54… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed May 9 20:33:47 2007 +0100 msacm32: Exclude unused headers. --- dlls/msacm32/driver.c | 2 -- dlls/msacm32/msacm32_main.c | 1 - 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index 0a1cba6..086eef2 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -29,11 +29,9 @@ #include "windef.h" #include "winbase.h" -#include "winerror.h" #include "wingdi.h" #include "winuser.h" #include "winnls.h" -#include "winreg.h" #include "mmsystem.h" #include "mmreg.h" #include "msacm.h" diff --git a/dlls/msacm32/msacm32_main.c b/dlls/msacm32/msacm32_main.c index cc08b85..d3160e3 100644 --- a/dlls/msacm32/msacm32_main.c +++ b/dlls/msacm32/msacm32_main.c @@ -25,7 +25,6 @@ #include "windef.h" #include "winbase.h" -#include "winerror.h" #include "wine/debug.h" #include "mmsystem.h" #define NOBITMAP

1 0

H. Verbeet : wined3d: Unload vertex weight data in case of EXT_VERTEX_WEIGHTING as well.
by Alexandre Julliard May 10, 2007

May 10, 2007

Module: wine Branch: master Commit: f8714d771a7fddfc30b8d9c64855aefcd6abcc27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8714d771a7fddfc30b8d9c64… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed May 9 19:07:33 2007 +0200 wined3d: Unload vertex weight data in case of EXT_VERTEX_WEIGHTING as well. --- dlls/wined3d/state.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d828fcc..281f8bb 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2538,6 +2538,8 @@ static inline void unloadVertexData(IWineD3DStateBlockImpl *stateblock) { } if (GL_SUPPORT(ARB_VERTEX_BLEND)) { glDisableClientState(GL_WEIGHT_ARRAY_ARB); + } else if (GL_SUPPORT(EXT_VERTEX_WEIGHTING)) { + glDisableClientState(GL_VERTEX_WEIGHT_ARRAY_EXT); } for (texture_idx = 0; texture_idx < GL_LIMITS(textures); ++texture_idx) { GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + texture_idx));

1 0

Andrew Talbot : mciwave: Exclude unused header.
by Alexandre Julliard May 10, 2007

May 10, 2007

Module: wine Branch: master Commit: bf1c57de275e70177a65171f5876ee0e3eaf51ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf1c57de275e70177a65171f5… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue May 8 23:13:24 2007 +0100 mciwave: Exclude unused header. --- dlls/mciwave/mciwave.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 18c77fe..8d8fde3 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -22,7 +22,6 @@ #include <stdarg.h> -#include "winerror.h" #include "windef.h" #include "winbase.h" #include "wingdi.h"

1 0

Andrew Talbot : mapi32: Exclude unused header.
by Alexandre Julliard May 10, 2007

May 10, 2007

Module: wine Branch: master Commit: f9f70984a5666003097a2b01dcefad02dd036f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9f70984a5666003097a2b01d… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue May 8 23:13:16 2007 +0100 mapi32: Exclude unused header. --- dlls/mapi32/sendmail.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index a92fe64..eb954a5 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -27,7 +27,6 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winnls.h" #include "objbase.h" #include "mapi.h" #include "winreg.h"

1 0

Andrew Talbot : localspl: Exclude unused headers.
by Alexandre Julliard May 10, 2007

May 10, 2007

Module: wine Branch: master Commit: dd1263aa485663464550ca98a8c0e3ef651e89da URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd1263aa485663464550ca98a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue May 8 23:13:09 2007 +0100 localspl: Exclude unused headers. --- dlls/localspl/localmon.c | 2 -- dlls/localspl/localspl_main.c | 6 ------ 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index fda2c91..57cdd7a 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -28,8 +28,6 @@ #include "wingdi.h" #include "winuser.h" #include "winreg.h" -#include "winver.h" -#include "winnls.h" #include "winspool.h" #include "ddk/winsplp.h" diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c index 9fd72e0..800d1c5 100644 --- a/dlls/localspl/localspl_main.c +++ b/dlls/localspl/localspl_main.c @@ -27,12 +27,6 @@ #include "winbase.h" #include "wingdi.h" #include "winuser.h" -#include "winreg.h" -#include "winver.h" -#include "winnls.h" - -#include "winspool.h" -#include "ddk/winsplp.h" #include "wine/debug.h" #include "localspl_private.h"

1 0

Andrew Talbot : mscms: Exclude unused headers.
by Alexandre Julliard May 10, 2007

May 10, 2007

Module: wine Branch: master Commit: 5c4e38726cd46c26d740f9eccf78a7e13b7f445c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4e38726cd46c26d740f9ecc… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed May 9 20:33:50 2007 +0100 mscms: Exclude unused headers. --- dlls/mscms/icc.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/mscms/icc.c b/dlls/mscms/icc.c index 715a8ed..e5d0ba8 100644 --- a/dlls/mscms/icc.c +++ b/dlls/mscms/icc.c @@ -24,10 +24,8 @@ #include "windef.h" #include "winbase.h" -#include "winnls.h" #include "wingdi.h" #include "winuser.h" -#include "winreg.h" #include "winternl.h" #include "icm.h"

1 0