January 2007 - Wine-Commits

Vitaliy Margolen : winex11drv: Change FIXME to WARN in X11DRV_GetKeyNameText.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: edd84eedc889227d5c9cf2bc249b54c464bf7aa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edd84eedc889227d5c9cf2bc2… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Jan 6 17:09:29 2007 -0700 winex11drv: Change FIXME to WARN in X11DRV_GetKeyNameText. --- dlls/winex11.drv/keyboard.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index c5947cf..33564cf 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2279,9 +2279,9 @@ INT X11DRV_GetKeyNameText(LONG lParam, L } } - /* Finally issue FIXME for unknown keys */ + /* Finally issue WARN for unknown keys */ - FIXME("(%08x,%p,%d): unsupported key, vkey=%04x, ansi=%04x\n",lParam,lpBuffer,nSize,vkey,ansi); + WARN("(%08x,%p,%d): unsupported key, vkey=%04x, ansi=%04x\n",lParam,lpBuffer,nSize,vkey,ansi); if (lpBuffer && nSize) *lpBuffer = 0; return 0;

1 0

Duane Clark : comctl32: listview: Allow LVIF_STATE flag in subitems.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 2575c37b22371e2df0ce7f436577920129692781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2575c37b22371e2df0ce7f436… Author: Duane Clark <fpga(a)pacbell.net> Date: Sat Jan 6 15:55:45 2007 -0800 comctl32: listview: Allow LVIF_STATE flag in subitems. --- dlls/comctl32/listview.c | 8 ++++++-- dlls/comctl32/tests/listview.c | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6340c87..11e02ee 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3506,8 +3506,12 @@ static BOOL set_sub_item(LISTVIEW_INFO * if (lpLVItem->iSubItem >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return FALSE; /* First do some sanity checks */ - if (lpLVItem->mask & ~(LVIF_TEXT | LVIF_IMAGE)) return FALSE; - if (!(lpLVItem->mask & (LVIF_TEXT | LVIF_IMAGE))) return TRUE; + /* The LVIF_STATE flag is valid for subitems, but does not appear to be + particularly useful. We currently do not actually do anything with + the flag on subitems. + */ + if (lpLVItem->mask & ~(LVIF_TEXT | LVIF_IMAGE | LVIF_STATE)) return FALSE; + if (!(lpLVItem->mask & (LVIF_TEXT | LVIF_IMAGE | LVIF_STATE))) return TRUE; /* get the subitem structure, and create it if not there */ hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, lpLVItem->iItem); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 127208c..9d14e39 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -313,6 +313,33 @@ static void test_items(void) ok(r != 0, "ret %d\n", r); ok(item.lParam == lparamTest, "got lParam %lx, expected %lx\n", item.lParam, lparamTest); + /**** Some tests of state highlighting ****/ + memset (&item, 0xaa, sizeof (item)); + item.mask = LVIF_STATE; + item.iItem = 0; + item.iSubItem = 0; + item.state = LVIS_SELECTED; + item.stateMask = LVIS_SELECTED | LVIS_DROPHILITED; + r = SendMessage(hwnd, LVM_SETITEM, 0, (LPARAM) &item); + ok(r != 0, "ret %d\n", r); + item.iSubItem = 1; + item.state = LVIS_DROPHILITED; + r = SendMessage(hwnd, LVM_SETITEM, 0, (LPARAM) &item); + ok(r != 0, "ret %d\n", r); + + memset (&item, 0xaa, sizeof (item)); + item.mask = LVIF_STATE; + item.iItem = 0; + item.iSubItem = 0; + item.stateMask = -1; + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); + ok(r != 0, "ret %d\n", r); + ok(item.state == LVIS_SELECTED, "got state %x, expected %x\n", item.state, LVIS_SELECTED); + item.iSubItem = 1; + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM) &item); + ok(r != 0, "ret %d\n", r); + todo_wine ok(item.state == LVIS_DROPHILITED, "got state %x, expected %x\n", item.state, LVIS_DROPHILITED); + DestroyWindow(hwnd); }

1 0

Jonathan Ernst : localspl: Added French translation.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: dbedc885daf37b53400485d6c936a9a2349fc836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbedc885daf37b53400485d6c… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Sun Jan 7 00:01:47 2007 +0100 localspl: Added French translation. --- dlls/localspl/localspl.rc | 1 + dlls/localspl/spl_Fr.rc | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/localspl/localspl.rc b/dlls/localspl/localspl.rc index a9ca999..73d58d8 100644 --- a/dlls/localspl/localspl.rc +++ b/dlls/localspl/localspl.rc @@ -38,5 +38,6 @@ #include "spl_En.rc" #include "spl_De.rc" +#include "spl_Fr.rc" #include "spl_Ko.rc" #include "spl_No.rc" diff --git a/dlls/localspl/spl_Fr.rc b/dlls/localspl/spl_Fr.rc new file mode 100644 index 0000000..cafe232 --- /dev/null +++ b/dlls/localspl/spl_Fr.rc @@ -0,0 +1,28 @@ +/* + * French resources for localspl + * + * Copyright 2007 Jonathan Ernst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + IDS_LOCALPORT "Port local" + IDS_LOCALMONITOR "Moniteur local" + IDS_NOTHINGTOCONFIG "Ce port n'a pas d'option � configurer" +}

1 0

Stefan Dösinger : wined3d: Fix np2 textures.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 577f8db7cfe967a7400e75f7e23cd3244a2d735a URL: http://source.winehq.org/git/wine.git/?a=commit;h=577f8db7cfe967a7400e75f7e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 6 18:43:08 2007 +0100 wined3d: Fix np2 textures. --- dlls/wined3d/state.c | 27 +++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e2ed6ce..af899e5 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1752,13 +1752,28 @@ static void sampler(DWORD state, IWineD3 } if(stateblock->textures[sampler]) { + BOOL texIsPow2 = FALSE; - /* NP2 textures need the texture matrix set properly for the stage */ - if(wined3d_settings.nonpower2_mode == NP2_NATIVE && sampler < MAX_TEXTURES - 1 && - stateblock->textureDimensions[sampler] == GL_TEXTURE_2D && - (((IWineD3DTextureImpl *) stateblock->textures[sampler])->pow2scalingFactorX != 1.0 || - ((IWineD3DTextureImpl *) stateblock->textures[sampler])->pow2scalingFactorY != 1.0 ) ) { - transform_texture(STATE_TRANSFORM(WINED3DTS_TEXTURE0 + stateblock->wineD3DDevice->texUnitMap[sampler]), stateblock); + /* The fixed function np2 texture emulation uses the texture matrix to fix up the coordinates + * IWineD3DBaseTexture::ApplyStateChanges multiplies the set matrix with a fixup matrix. Before the + * scaling is reapplied or removed, the texture matrix has to be reapplied + */ + if(wined3d_settings.nonpower2_mode != NP2_NATIVE && sampler < MAX_TEXTURES) { + if(stateblock->textureDimensions[sampler] == GL_TEXTURE_2D) { + if(((IWineD3DTextureImpl *) stateblock->textures[sampler])->pow2scalingFactorX != 1.0 || + ((IWineD3DTextureImpl *) stateblock->textures[sampler])->pow2scalingFactorY != 1.0 ) { + texIsPow2 = TRUE; + } + } else if(stateblock->textureDimensions[sampler] == GL_TEXTURE_CUBE_MAP_ARB) { + if(((IWineD3DCubeTextureImpl *) stateblock->textures[sampler])->pow2scalingFactor != 1.0) { + texIsPow2 = TRUE; + } + } + + if(texIsPow2 || stateblock->wineD3DDevice->lastWasPow2Texture[sampler]) { + transform_texture(STATE_TRANSFORM(WINED3DTS_TEXTURE0 + stateblock->wineD3DDevice->texUnitMap[sampler]), stateblock); + stateblock->wineD3DDevice->lastWasPow2Texture[sampler] = texIsPow2; + } } IWineD3DBaseTexture_PreLoad((IWineD3DBaseTexture *) stateblock->textures[sampler]); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f50182a..c018c27 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -583,6 +583,7 @@ typedef struct IWineD3DDeviceImpl BOOL last_was_vshader; BOOL last_was_foggy_shader; BOOL namedArraysLoaded, numberedArraysLoaded; + BOOL lastWasPow2Texture[MAX_TEXTURES]; /* State block related */ BOOL isRecordingState;

1 0

Stefan Dösinger : wined3d: Do not try to read the vertex decl when the stateblock isn't finalized.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 9f2e0fa2e09345a93fbdee852b933937c6ef98f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f2e0fa2e09345a93fbdee852… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 6 18:41:43 2007 +0100 wined3d: Do not try to read the vertex decl when the stateblock isn't finalized. --- dlls/wined3d/drawprim.c | 6 ++++++ dlls/wined3d/vertexbuffer.c | 15 ++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 129c42e..cf47106 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1247,6 +1247,9 @@ void drawPrimitive(IWineD3DDevice *iface DWORD dirtyState, idx; BYTE shift; + /* Signals other modules that a drawing is in progress and the stateblock finalized */ + This->isInDraw = TRUE; + /* Invalidate the back buffer memory so LockRect will read it the next time */ for(i = 0; i < IWineD3DDevice_GetNumberOfSwapChains(iface); i++) { IWineD3DDevice_GetSwapChain(iface, i, (IWineD3DSwapChain **) &swapchain); @@ -1340,4 +1343,7 @@ void drawPrimitive(IWineD3DDevice *iface ++primCounter; } #endif + + /* Control goes back to the device, stateblock values may change again */ + This->isInDraw = FALSE; } diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index b89d922..181c244 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -258,7 +258,20 @@ static void WINAPI IWineD3DVertexBuf return; /* Not doing any conversion */ } - declChanged = IWineD3DVertexBufferImpl_FindDecl(This); + /* Reading the declaration makes only sense if the stateblock is finalized and the buffer bound to a stream */ + if(This->resource.wineD3DDevice->isInDraw && This->Flags & VBFLAG_STREAM) { + declChanged = IWineD3DVertexBufferImpl_FindDecl(This); + } else if(This->Flags & VBFLAG_HASDESC) { + /* Reuse the declaration stored in the buffer. It will most likely not change, and if it does + * the stream source state handler will call PreLoad again and the change will be cought + */ + } else { + /* Cannot get a declaration, and no declaration is stored in the buffer. It is pointless to preload + * now. When the buffer is used, PreLoad will be called by the stream source state handler and a valid + * declaration for the buffer can be found + */ + return; + } /* If applications change the declaration over and over, reconverting all the time is a huge * performance hit. So count the declaration changes and release the VBO if there are too much diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e8b60de..f50182a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -588,6 +588,7 @@ typedef struct IWineD3DDeviceImpl BOOL isRecordingState; IWineD3DStateBlockImpl *stateBlock; IWineD3DStateBlockImpl *updateStateBlock; + BOOL isInDraw; /* Internal use fields */ WINED3DDEVICE_CREATION_PARAMETERS createParms;

1 0

Stefan Dösinger : wined3d: Remove some unneeded context cache members from the device.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 2e55c196ee1b177e11b354273d80af1a8cb9ca38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e55c196ee1b177e11b354273… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 6 18:34:59 2007 +0100 wined3d: Remove some unneeded context cache members from the device. --- dlls/wined3d/state.c | 5 ----- dlls/wined3d/wined3d_private.h | 3 --- 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0e36a08..e2ed6ce 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -307,10 +307,6 @@ static void state_blend(DWORD state, IWi TRACE("glBlendFunc src=%x, dst=%x\n", srcBlend, dstBlend); glBlendFunc(srcBlend, dstBlend); checkGLcall("glBlendFunc"); - - /* TODO: Remove when state management done */ - stateblock->wineD3DDevice->dstBlend = dstBlend; - stateblock->wineD3DDevice->srcBlend = srcBlend; } static void state_blendfactor(DWORD state, IWineD3DStateBlockImpl *stateblock) { @@ -361,7 +357,6 @@ static void state_alpha(DWORD state, IWi glParm = CompareFunc(stateblock->renderState[WINED3DRS_ALPHAFUNC]); } if(glParm) { - stateblock->wineD3DDevice->alphafunc = glParm; /* Remove when state management done */ glAlphaFunc(glParm, ref); checkGLcall("glAlphaFunc"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 83a8f17..e8b60de 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -576,9 +576,6 @@ typedef struct IWineD3DDeviceImpl #define IS_TRACKING 1 /* tracking_parm is tracking diffuse color */ #define NEEDS_TRACKING 2 /* Tracking needs to be enabled when needed */ #define NEEDS_DISABLE 3 /* Tracking needs to be disabled when needed*/ - UINT srcBlend; - UINT dstBlend; - UINT alphafunc; BOOL texture_shader_active; /* TODO: Confirm use is correct */ BOOL last_was_notclipped; BOOL untransformed;

1 0

Stefan Dösinger : wined3d: Vertex buffers can use the declaration from the device.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: d47ec212807e2e7a4e9ba47b5fc4a0082dc0f966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d47ec212807e2e7a4e9ba47b5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 6 18:31:43 2007 +0100 wined3d: Vertex buffers can use the declaration from the device. --- dlls/wined3d/drawprim.c | 39 +++++++++++++++++++++++++++++++- dlls/wined3d/vertexbuffer.c | 51 ++++++++++++++++--------------------------- 2 files changed, 56 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 3b14c4a..129c42e 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -219,6 +219,10 @@ void primitiveDeclarationConvertToStride WINED3DVERTEXELEMENT *element; DWORD stride; int reg; + char isPreLoaded[MAX_STREAMS]; + DWORD preLoadStreams[MAX_STREAMS], numPreloadStreams = 0; + + memset(isPreLoaded, 0, sizeof(isPreLoaded)); /* Locate the vertex declaration */ if (This->stateBlock->vertexShader && ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->vertexDeclaration) { @@ -249,7 +253,11 @@ void primitiveDeclarationConvertToStride if(fixup && *fixup) FIXME("Missing fixed and unfixed vertices, expect graphics glitches\n"); } else { TRACE("Stream isn't up %d, %p\n", element->Stream, This->stateBlock->streamSource[element->Stream]); - IWineD3DVertexBuffer_PreLoad(This->stateBlock->streamSource[element->Stream]); + if(!isPreLoaded[element->Stream]) { + preLoadStreams[numPreloadStreams] = element->Stream; + numPreloadStreams++; + isPreLoaded[element->Stream] = 1; + } data = IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[element->Stream], 0, &streamVBO); if(fixup) { if( streamVBO != 0) *fixup = TRUE; @@ -287,6 +295,17 @@ void primitiveDeclarationConvertToStride } } }; + /* Now call PreLoad on all the vertex buffers. In the very rare case + * that the buffers stopps converting PreLoad will dirtify the VDECL again. + * The vertex buffer can now use the strided structure in the device instead of finding its + * own again. + * + * NULL streams won't be recorded in the array, UP streams won't be either. A stream is only + * once in there. + */ + for(i=0; i < numPreloadStreams; i++) { + IWineD3DVertexBuffer_PreLoad(This->stateBlock->streamSource[preLoadStreams[i]]); + } } void primitiveConvertFVFtoOffset(DWORD thisFVF, DWORD stride, BYTE *data, WineDirect3DVertexStridedData *strided, GLint streamVBO) { @@ -413,6 +432,7 @@ void primitiveConvertToStridedData(IWine short LoopThroughTo = 0; short nStream; GLint streamVBO = 0; + DWORD preLoadStreams[MAX_STREAMS], numPreloadStreams = 0; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; @@ -443,7 +463,11 @@ void primitiveConvertToStridedData(IWine streamVBO = 0; data = (BYTE *)This->stateBlock->streamSource[nStream]; } else { - IWineD3DVertexBuffer_PreLoad(This->stateBlock->streamSource[nStream]); + /* The for loop should iterate through here only once per stream, so we don't need magic to prevent double loading + * buffers + */ + preLoadStreams[numPreloadStreams] = nStream; + numPreloadStreams++; /* GetMemory binds the VBO */ data = IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[nStream], 0, &streamVBO); if(fixup) { @@ -462,6 +486,17 @@ void primitiveConvertToStridedData(IWine /* Now convert the stream into pointers */ primitiveConvertFVFtoOffset(thisFVF, stride, data, strided, streamVBO); } + /* Now call PreLoad on all the vertex buffers. In the very rare case + * that the buffers stopps converting PreLoad will dirtify the VDECL again. + * The vertex buffer can now use the strided structure in the device instead of finding its + * own again. + * + * NULL streams won't be recorded in the array, UP streams won't be either. A stream is only + * once in there. + */ + for(nStream=0; nStream < numPreloadStreams; nStream++) { + IWineD3DVertexBuffer_PreLoad(This->stateBlock->streamSource[preLoadStreams[nStream]]); + } } #if 0 /* TODO: Software Shaders */ diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 2f8a4f7..b89d922 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -164,7 +164,6 @@ inline BOOL WINAPI IWineD3DVertexBufferI { WineDirect3DVertexStridedData strided; IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; - BOOL ret; memset(&strided, 0, sizeof(strided)); /* There are certain vertex data types that need to be fixed up. The Vertex Buffers FVF doesn't @@ -191,38 +190,18 @@ inline BOOL WINAPI IWineD3DVertexBufferI * FALSE: otherwise */ - if(device->stateBlock->vertexShader != NULL && wined3d_settings.vs_mode != VS_NONE - &&((IWineD3DVertexShaderImpl *)device->stateBlock->vertexShader)->baseShader.function != NULL - && GL_SUPPORT(ARB_VERTEX_PROGRAM)) { - /* Case 1: Vertex Shader: No conversion */ - TRACE("Vertex Shader, no conversion needed\n"); - } else if(device->stateBlock->vertexDecl || device->stateBlock->vertexShader) { - /* Case 2: Vertex Declaration */ - TRACE("Using vertex declaration\n"); - - This->Flags |= VBFLAG_LOAD; - primitiveDeclarationConvertToStridedData((IWineD3DDevice *) device, - FALSE, - &strided, - &ret /* buffer contains fixed data, ignored here */); - This->Flags &= ~VBFLAG_LOAD; - + if(device->stateBlock->vertexShader && ((IWineD3DVertexShaderImpl *) device->stateBlock->vertexShader)->baseShader.function) { + /* Assume no conversion */ + memset(&strided, 0, sizeof(strided)); } else { - /* Case 3: FVF */ - if(!(This->Flags & VBFLAG_STREAM) ) { - TRACE("No vertex decl used and buffer is not bound to a stream\n"); - /* No reload needed */ - return FALSE; - } else { - This->Flags |= VBFLAG_LOAD; - primitiveConvertFVFtoOffset(device->stateBlock->fvf, - device->stateBlock->streamStride[This->stream], - NULL, - &strided, - This->vbo); - This->Flags &= ~VBFLAG_LOAD; - /* Data can only come from this buffer */ - } + /* we need a copy because we modify some params */ + memcpy(&strided, &device->strided_streams, sizeof(strided)); + + /* Filter out data that does not come from this VBO */ + if(strided.u.s.position.VBO != This->vbo) memset(&strided.u.s.position, 0, sizeof(strided.u.s.position)); + if(strided.u.s.diffuse.VBO != This->vbo) memset(&strided.u.s.diffuse, 0, sizeof(strided.u.s.diffuse)); + if(strided.u.s.specular.VBO != This->vbo) memset(&strided.u.s.specular, 0, sizeof(strided.u.s.specular)); + if(strided.u.s.position2.VBO != This->vbo) memset(&strided.u.s.position2, 0, sizeof(strided.u.s.position2)); } /* Filter out data that does not come from this VBO */ @@ -297,6 +276,14 @@ static void WINAPI IWineD3DVertexBuf checkGLcall("glDeleteBuffersARB"); LEAVE_GL(); This->vbo = 0; + + /* The stream source state handler might have read the memory of the vertex buffer already + * and got the memory in the vbo which is not valid any longer. Dirtify the stream source + * to force a reload. This happens only once per changed vertexbuffer and should occur rather + * rarely + */ + IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_STREAMSRC); + return; } /* Otherwise do not bother to release the VBO. If we're doing direct locking now,

1 0

Stefan Dösinger : wined3d: Do not preload vertex buffers in unlock.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 6fb1869b98265a30a285c6f94a768934476a8c2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fb1869b98265a30a285c6f94… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 6 18:30:34 2007 +0100 wined3d: Do not preload vertex buffers in unlock. --- dlls/wined3d/vertexbuffer.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/vertexbuffer.c b/dlls/wined3d/vertexbuffer.c index 6552e36..2f8a4f7 100644 --- a/dlls/wined3d/vertexbuffer.c +++ b/dlls/wined3d/vertexbuffer.c @@ -491,8 +491,6 @@ HRESULT WINAPI IWineD3DVertexBufferImpl GL_EXTCALL(glUnmapBufferARB(GL_ARRAY_BUFFER_ARB)); checkGLcall("glUnmapBufferARB"); LEAVE_GL(); - } else if(This->Flags & VBFLAG_HASDESC){ - IWineD3DVertexBufferImpl_PreLoad(iface); } return WINED3D_OK; }

1 0

Stefan Dösinger : wined3d: Clean up drawprim a bit.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: b310e98693d827d457402d82a33f01afa111b06f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b310e98693d827d457402d82a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 6 18:28:42 2007 +0100 wined3d: Clean up drawprim a bit. --- dlls/wined3d/drawprim.c | 44 ++++++-------------------------------------- 1 files changed, 6 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index b913448..3b14c4a 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1092,29 +1092,6 @@ void drawStridedSoftwareVS(IWineD3DDevic #endif -inline static void drawPrimitiveDrawStrided( - IWineD3DDevice *iface, - BOOL useVertexShaderFunction, - BOOL usePixelShaderFunction, - WineDirect3DVertexStridedData *dataLocations, - ULONG baseVIndex, - UINT numberOfvertices, - UINT numberOfIndicies, - GLenum glPrimType, - const void *idxData, - short idxSize, - int minIndex, - long StartIdx) { - - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - - /* Draw vertex-by-vertex */ - if (This->useDrawStridedSlow) - drawStridedSlow(iface, dataLocations, numberOfIndicies, glPrimType, idxData, idxSize, minIndex, StartIdx, baseVIndex); - else - drawStridedFast(iface, numberOfIndicies, glPrimType, idxData, idxSize, minIndex, StartIdx, baseVIndex); -} - static void check_fbo_status(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; @@ -1230,23 +1207,11 @@ void drawPrimitive(IWineD3DDevice *iface int minIndex) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - BOOL useVertexShaderFunction = FALSE; - BOOL usePixelShaderFunction = FALSE; IWineD3DSwapChainImpl *swapchain; int i; DWORD dirtyState, idx; BYTE shift; - /* Shaders can be implemented using ARB_PROGRAM, GLSL, or software - - * here simply check whether a shader was set, or the user disabled shaders */ - if (This->vs_selected_mode != SHADER_NONE && This->stateBlock->vertexShader && - ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->baseShader.function != NULL) - useVertexShaderFunction = TRUE; - - if (This->ps_selected_mode != SHADER_NONE && This->stateBlock->pixelShader && - ((IWineD3DPixelShaderImpl *)This->stateBlock->pixelShader)->baseShader.function) - usePixelShaderFunction = TRUE; - /* Invalidate the back buffer memory so LockRect will read it the next time */ for(i = 0; i < IWineD3DDevice_GetNumberOfSwapChains(iface); i++) { IWineD3DDevice_GetSwapChain(iface, i, (IWineD3DSwapChain **) &swapchain); @@ -1289,9 +1254,12 @@ void drawPrimitive(IWineD3DDevice *iface if (numberOfVertices == 0 ) numberOfVertices = calculatedNumberOfindices; - drawPrimitiveDrawStrided(iface, useVertexShaderFunction, usePixelShaderFunction, - &This->strided_streams, StartVertexIndex, numberOfVertices, calculatedNumberOfindices, glPrimType, - idxData, idxSize, minIndex, StartIdx); + if (This->useDrawStridedSlow) + drawStridedSlow(iface, &This->strided_streams, calculatedNumberOfindices, + glPrimType, idxData, idxSize, minIndex, StartIdx, StartVertexIndex); + else + drawStridedFast(iface, calculatedNumberOfindices, glPrimType, + idxData, idxSize, minIndex, StartIdx, StartVertexIndex); } /* Finshed updating the screen, restore lock */

1 0

Stefan Dösinger : ddraw: Forward the DDSCAPS2_TEXTUREMANAGE flag to wined3d.
by Alexandre Julliard Jan. 8, 2007

Jan. 8, 2007

Module: wine Branch: master Commit: 4e8e47fc6cdaa173a8864f2d8c5744e3f69155a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e8e47fc6cdaa173a8864f2d8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jan 6 18:27:46 2007 +0100 ddraw: Forward the DDSCAPS2_TEXTUREMANAGE flag to wined3d. --- dlls/ddraw/ddraw.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 8b80586..bb7243d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1826,6 +1826,10 @@ IDirectDrawImpl_CreateNewSurface(IDirect { Pool = WINED3DPOOL_SYSTEMMEM; } + else if(pDDSD->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) + { + Pool = WINED3DPOOL_MANAGED; + } Format = PixelFormat_DD2WineD3D(&pDDSD->u4.ddpfPixelFormat); if(Format == WINED3DFMT_UNKNOWN)

1 0