January 2007 - Wine-Commits

Stefan Dösinger : wined3d: Remove d3ddevice_set_ortho.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: e26e3ee5f3b4e8ac7622020d8a6bd61fd20c838b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e26e3ee5f3b4e8ac7622020d8… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Jan 2 22:52:11 2007 +0100 wined3d: Remove d3ddevice_set_ortho. --- dlls/wined3d/device.c | 3 +- dlls/wined3d/drawprim.c | 16 ------- dlls/wined3d/state.c | 92 ++++++++++++++++++++++----------------- dlls/wined3d/surface.c | 8 ++- dlls/wined3d/wined3d_private.h | 3 - 5 files changed, 58 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e26e3ee5f3b4e8ac76220…

1 0

Stefan Dösinger : wined3d: Break the lighting state out of the vertex decl.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: a0ff9826ad8b6be47f6e3614a72754a93f80e8fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ff9826ad8b6be47f6e3614a… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Jan 2 22:49:17 2007 +0100 wined3d: Break the lighting state out of the vertex decl. --- dlls/wined3d/state.c | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ee56be2..e8a594e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -71,15 +71,23 @@ static void state_fillmode(DWORD state, } } -#if 0 -/* if 0ed because it will be revived later */ static void state_lighting(DWORD state, IWineD3DStateBlockImpl *stateblock) { + BOOL normals; - /* TODO: Lighting is only enabled if Vertex normals are passed by the application, - * so merge the lighting render state with the vertex declaration once it is available + /* Lighting is only enabled if Vertex normals are passed by the application, + * but lighting does not affect the stream sources, so it is not grouped for performance reasons. + * This state reads the decoded vertex decl, so if it is dirty don't do anything. The + * vertex declaration appplying function calls this function for updating */ - if (stateblock->renderState[WINED3DRS_LIGHTING]) { + if(isStateDirty(stateblock->wineD3DDevice, STATE_VDECL)) { + return; + } + + normals = stateblock->wineD3DDevice->strided_streams.u.s.normal.lpData != NULL || + stateblock->wineD3DDevice->strided_streams.u.s.normal.VBO != 0; + + if (stateblock->renderState[WINED3DRS_LIGHTING] && normals) { glEnable(GL_LIGHTING); checkGLcall("glEnable GL_LIGHTING"); } else { @@ -87,7 +95,6 @@ static void state_lighting(DWORD state, checkGLcall("glDisable GL_LIGHTING"); } } -#endif static void state_zenable(DWORD state, IWineD3DStateBlockImpl *stateblock) { switch ((WINED3DZBUFFERTYPE) stateblock->renderState[WINED3DRS_ZENABLE]) { @@ -1895,7 +1902,7 @@ static const GLfloat invymat[16] = { static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock) { BOOL useVertexShaderFunction = FALSE, updateFog = FALSE; - BOOL transformed, lit; + BOOL transformed; /* Some stuff is in the device until we have per context tracking */ IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; BOOL wasrhw = device->last_was_rhw; @@ -1951,22 +1958,14 @@ static void vertexdeclaration(DWORD stat transformed = ((device->strided_streams.u.s.position.lpData != NULL || device->strided_streams.u.s.position.VBO != 0) && device->strided_streams.u.s.position_transformed) ? TRUE : FALSE; - lit = device->strided_streams.u.s.normal.lpData == NULL && - device->strided_streams.u.s.normal.VBO == 0; if(transformed != device->last_was_rhw && !useVertexShaderFunction) { updateFog = TRUE; } - /* TODO: The vertex declaration changes lighting, but lighting doesn't affect the vertex declaration and the - * stream sources. This can be handled nicer - */ - if(stateblock->renderState[WINED3DRS_LIGHTING] && !lit) { - glEnable(GL_LIGHTING); - checkGLcall("glEnable(GL_LIGHTING)"); - } else { - glDisable(GL_LIGHTING); - checkGLcall("glDisable(GL_LIGHTING"); + /* Reapply lighting if it is not sheduled for reapplication already */ + if(!isStateDirty(device, STATE_RENDER(WINED3DRS_LIGHTING))) { + state_lighting(STATE_RENDER(WINED3DRS_LIGHTING), stateblock); } if (!useVertexShaderFunction && transformed) { @@ -2175,7 +2174,7 @@ const struct StateEntry StateTable[] = { /*134, WINED3DRS_WRAP6 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, { /*135, WINED3DRS_WRAP7 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, { /*136, WINED3DRS_CLIPPING */ STATE_RENDER(WINED3DRS_CLIPPING), state_clipping }, - { /*137, WINED3DRS_LIGHTING */ STATE_VDECL, vertexdeclaration }, + { /*137, WINED3DRS_LIGHTING */ STATE_RENDER(WINED3DRS_LIGHTING), state_lighting }, { /*138, WINED3DRS_EXTENTS */ STATE_RENDER(WINED3DRS_EXTENTS), state_extents }, { /*139, WINED3DRS_AMBIENT */ STATE_RENDER(WINED3DRS_AMBIENT), state_ambient }, { /*140, WINED3DRS_FOGVERTEXMODE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog },

1 0

Stefan Dösinger : wined3d: Move the world matrix to the state table.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: 5fa0f7f77563bbd77f48b476817dd3c77a877d49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fa0f7f77563bbd77f48b4768… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Jan 2 22:47:39 2007 +0100 wined3d: Move the world matrix to the state table. --- dlls/wined3d/device.c | 7 +--- dlls/wined3d/state.c | 74 +++++++++++++++++++++++++++------------ dlls/wined3d/surface.c | 2 + dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 54 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 00a888c..f205db9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1936,7 +1936,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl } /* Initialize the current view state */ - This->modelview_valid = 1; This->proj_valid = 0; This->view_ident = 1; This->last_was_rhw = 0; @@ -2364,13 +2363,9 @@ static HRESULT WINAPI IWineD3DDeviceIm */ /* Capture the times we can just ignore the change for now */ - if (d3dts == WINED3DTS_WORLDMATRIX(0)) { - This->modelview_valid = FALSE; - } else if (d3dts == WINED3DTS_VIEW) { /* handle the VIEW matrice */ + if (d3dts == WINED3DTS_VIEW) { /* handle the VIEW matrice */ This->view_ident = !memcmp(lpmatrix, identity, 16 * sizeof(float)); /* Handled by the state manager */ - } else { /* What was requested!?? */ - WARN("invalid matrix specified: %i\n", d3dts); } IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TRANSFORM(d3dts)); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3361c85..ee56be2 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1813,6 +1813,29 @@ static void pixelshader(DWORD state, IWi } } +static void transform_world(DWORD state, IWineD3DStateBlockImpl *stateblock) { + /* Do not bother applying when we're in rhw mode. vertexdeclaration() will call + * transform_world if it switches out of rhw mode. This function is also called + * by transform_view below if the view matrix was changed + */ + if(stateblock->wineD3DDevice->last_was_rhw) { + return; + } + glMatrixMode(GL_MODELVIEW); + checkGLcall("glMatrixMode"); + + /* In the general case, the view matrix is the identity matrix */ + if (stateblock->wineD3DDevice->view_ident) { + glLoadMatrixf((float *) &stateblock->transforms[WINED3DTS_WORLDMATRIX(0)].u.m[0][0]); + checkGLcall("glLoadMatrixf"); + } else { + glLoadMatrixf((float *) &stateblock->transforms[WINED3DTS_VIEW].u.m[0][0]); + checkGLcall("glLoadMatrixf"); + glMultMatrixf((float *) &stateblock->transforms[WINED3DTS_WORLDMATRIX(0)].u.m[0][0]); + checkGLcall("glMultMatrixf"); + } +} + static void transform_view(DWORD state, IWineD3DStateBlockImpl *stateblock) { unsigned int k; @@ -1823,12 +1846,9 @@ static void transform_view(DWORD state, */ PLIGHTINFOEL *lightChain = NULL; - stateblock->wineD3DDevice->modelview_valid = FALSE; glMatrixMode(GL_MODELVIEW); checkGLcall("glMatrixMode(GL_MODELVIEW)"); - glPushMatrix(); - checkGLcall("glPushMatrix()"); glLoadMatrixf((float *)(float *) &stateblock->transforms[WINED3DTS_VIEW].u.m[0][0]); checkGLcall("glLoadMatrixf(...)"); @@ -1847,11 +1867,20 @@ static void transform_view(DWORD state, glClipPlane(GL_CLIP_PLANE0 + k, stateblock->clipplane[k]); checkGLcall("glClipPlane"); } - glPopMatrix(); - checkGLcall("glPopMatrix()"); - /* Call the vdecl update. Will be tidied up later */ - StateTable[STATE_VDECL].apply(STATE_VDECL, stateblock); + if(stateblock->wineD3DDevice->last_was_rhw) { + glLoadIdentity(); + checkGLcall("glLoadIdentity()"); + /* No need to update the world matrix, the identity is fine */ + return; + } + + /* Call the world matrix state, this will apply the combined WORLD + VIEW matrix + * No need to do it here if the state is scheduled for update. + */ + if(!isStateDirty(stateblock->wineD3DDevice, STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(0)))) { + transform_world(STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(0)), stateblock); + } } static void transform_worldex(DWORD state, IWineD3DStateBlockImpl *stateBlock) { @@ -1869,9 +1898,10 @@ static void vertexdeclaration(DWORD stat BOOL transformed, lit; /* Some stuff is in the device until we have per context tracking */ IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; + BOOL wasrhw = device->last_was_rhw; device->streamFixedUp = FALSE; - + /* Shaders can be implemented using ARB_PROGRAM, GLSL, or software - * here simply check whether a shader was set, or the user disabled shaders */ @@ -1945,22 +1975,20 @@ static void vertexdeclaration(DWORD stat } else { /* Untransformed, so relies on the view and projection matrices */ + device->last_was_rhw = FALSE; + /* This turns off the Z scale trick to 'disable' viewport frustum clipping in rhw mode*/ device->untransformed = TRUE; - if (!useVertexShaderFunction) { - device->modelview_valid = TRUE; - glMatrixMode(GL_MODELVIEW); - checkGLcall("glMatrixMode"); - - /* In the general case, the view matrix is the identity matrix */ - if (device->view_ident) { - glLoadMatrixf((float *) &stateblock->transforms[WINED3DTS_WORLDMATRIX(0)].u.m[0][0]); - checkGLcall("glLoadMatrixf"); - } else { - glLoadMatrixf((float *) &stateblock->transforms[WINED3DTS_VIEW].u.m[0][0]); - checkGLcall("glLoadMatrixf"); - glMultMatrixf((float *) &stateblock->transforms[WINED3DTS_WORLDMATRIX(0)].u.m[0][0]); - checkGLcall("glMultMatrixf"); + /* Don't bother checking for !useVertexShaderFunction here. If shaders are always on wasrhw will never + * be true. If they are switched on and off then knowing that the fixed function matrices are ok makes + * those switches cheaper + */ + if (wasrhw) { + /* switching out of orthogonal mode? have to reapply the modelview matrix. + * Only do that when it is not dirty though + */ + if(!isStateDirty(device, STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(0)))) { + transform_world(STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(0)), stateblock); } } @@ -2763,7 +2791,7 @@ const struct StateEntry StateTable[] = { /*254, undefined */ 0, state_undefined }, { /*255, undefined */ 0, state_undefined }, /* End huge gap */ - { /*256, WINED3DTS_WORLDMATRIX(0) */ STATE_VDECL, vertexdeclaration }, + { /*256, WINED3DTS_WORLDMATRIX(0) */ STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(0)), transform_world }, { /*257, WINED3DTS_WORLDMATRIX(1) */ STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(1)), transform_worldex }, { /*258, WINED3DTS_WORLDMATRIX(2) */ STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(2)), transform_worldex }, { /*259, WINED3DTS_WORLDMATRIX(3) */ STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(3)), transform_worldex }, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 031d320..200b52e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1150,6 +1150,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp we want to draw at screen position 0,0 - Set up ortho (rhw) mode as per drawprim (and leave set - it will sort itself out due to last_was_rhw */ d3ddevice_set_ortho(This->resource.wineD3DDevice); + IWineD3DDeviceImpl_MarkStateDirty(myDevice, STATE_VDECL); if (iface == implSwapChain->frontBuffer) { glDrawBuffer(GL_FRONT); @@ -2473,6 +2474,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOv /* Draw a textured quad */ d3ddevice_set_ortho(This->resource.wineD3DDevice); + IWineD3DDeviceImpl_MarkStateDirty(myDevice, STATE_VDECL); glBegin(GL_QUADS); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7e41f5c..7b5eaa1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -563,7 +563,6 @@ typedef struct IWineD3DDeviceImpl const shader_backend_t *shader_backend; /* Optimization */ - BOOL modelview_valid; BOOL proj_valid; BOOL view_ident; /* true iff view matrix is identity */ BOOL last_was_rhw; /* true iff last draw_primitive was in xyzrhw mode */

1 0

Stefan Dösinger : wined3d: Add a viewport state to the state table.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: a48bbc36119945c3f9476a1fab28364345893bf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a48bbc36119945c3f9476a1fa… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Jan 2 21:40:59 2007 +0100 wined3d: Add a viewport state to the state table. --- dlls/wined3d/device.c | 2 ++ dlls/wined3d/state.c | 1 + dlls/wined3d/wined3d_private.h | 5 ++++- 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7c31f66..52e9012 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3095,6 +3095,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl LEAVE_GL(); + /* Todo: move the gl code too */ + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VIEWPORT); return WINED3D_OK; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f68546b..3eed45e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2919,5 +2919,6 @@ const struct StateEntry StateTable[] = { /* , STATE_STREAMSRC */ STATE_VDECL, vertexdeclaration }, { /* , STATE_VDECL */ STATE_VDECL, vertexdeclaration }, { /* , STATE_VSHADER */ STATE_VDECL, vertexdeclaration }, + { /* , STATE_VIEWPORT */ STATE_VDECL, vertexdeclaration }, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 15958f3..8088b70 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -433,7 +433,10 @@ typedef void (*APPLYSTATEFUNC)(DWORD sta #define STATE_VSHADER (STATE_VDECL + 1) #define STATE_IS_VSHADER(a) ((a) == STATE_VSHADER) -#define STATE_HIGHEST (STATE_VSHADER) +#define STATE_VIEWPORT (STATE_VSHADER + 1) +#define STATE_IS_VIEWPORT(a) ((a) == STATE_VIEWPORT) + +#define STATE_HIGHEST (STATE_VIEWPORT) struct StateEntry {

1 0

Stefan Dösinger : wined3d: Move the functionality of primitiveInitState to the state table.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: 20de200fa321398a5470e0d9db67c3da39f54a74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20de200fa321398a5470e0d9d… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Jan 2 22:47:10 2007 +0100 wined3d: Move the functionality of primitiveInitState to the state table. --- dlls/wined3d/device.c | 15 ---- dlls/wined3d/drawprim.c | 126 +------------------------------- dlls/wined3d/state.c | 160 +++++++++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 135 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=20de200fa321398a5470e…

1 0

Stefan Dösinger : wined3d: Move decoding the vertex declaration to the vertexshader state handler.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: 438c17284138776edbbe9196364ae620bbf01adb URL: http://source.winehq.org/git/wine.git/?a=commit;h=438c17284138776edbbe91963… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Jan 2 21:31:08 2007 +0100 wined3d: Move decoding the vertex declaration to the vertexshader state handler. --- dlls/wined3d/drawprim.c | 41 +---------------------------------- dlls/wined3d/state.c | 45 ++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 46 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 5dfc15b..6bd2854 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1943,7 +1943,7 @@ void drawPrimitive(IWineD3DDevice *iface BOOL usePixelShaderFunction = FALSE; IWineD3DSwapChainImpl *swapchain; int i; - BOOL fixup = FALSE; + BOOL fixup; DWORD dirtyState, idx; BYTE shift; @@ -1980,6 +1980,7 @@ void drawPrimitive(IWineD3DDevice *iface StateTable[dirtyState].apply(dirtyState, This->stateBlock); } This->numDirtyEntries = 0; /* This makes the whole list clean */ + fixup = This->streamFixedUp; if (TRACE_ON(d3d_draw) && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { check_fbo_status(iface); @@ -1990,44 +1991,6 @@ void drawPrimitive(IWineD3DDevice *iface } This->depth_copy_state = WINED3D_DCS_INITIAL; - if(This->up_strided) { - - /* Note: this is a ddraw fixed-function code path */ - - TRACE("================ Strided Input ===================\n"); - memcpy(&This->strided_streams, This->up_strided, sizeof(This->strided_streams)); - drawPrimitiveTraceDataLocations(&This->strided_streams); - fixup = FALSE; - } - - else if (This->stateBlock->vertexDecl || This->stateBlock->vertexShader) { - - /* Note: This is a fixed function or shader codepath. - * This means it must handle both types of strided data. - * Shaders must go through here to zero the strided data, even if they - * don't set any declaration at all */ - - TRACE("================ Vertex Declaration ===================\n"); - memset(&This->strided_streams, 0, sizeof(This->strided_streams)); - - if (This->stateBlock->vertexDecl != NULL || - ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->vertexDeclaration != NULL) - - primitiveDeclarationConvertToStridedData(iface, useVertexShaderFunction, - &This->strided_streams, &fixup); - - } else { - - /* Note: This codepath is not reachable from d3d9 (see fvf->decl9 conversion) - * It is reachable through d3d8, but only for fixed-function. - * It will not work properly for shaders. */ - - TRACE("================ FVF ===================\n"); - memset(&This->strided_streams, 0, sizeof(This->strided_streams)); - primitiveConvertToStridedData(iface, &This->strided_streams, &fixup); - drawPrimitiveTraceDataLocations(&This->strided_streams); - } - /* Setup transform matrices and sort out */ primitiveInitState(iface, &This->strided_streams, useVertexShaderFunction, &lighting_changed, &lighting_original); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a8419a7..f68546b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1857,8 +1857,49 @@ static void transform_worldex(DWORD stat WARN("World matrix 1 - 255 not supported yet\n"); } -static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateBlock) { - TRACE("To be filled later\n"); +static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock) { + BOOL useVertexShaderFunction = FALSE; + stateblock->wineD3DDevice->streamFixedUp = FALSE; + + /* Shaders can be implemented using ARB_PROGRAM, GLSL, or software - + * here simply check whether a shader was set, or the user disabled shaders + */ + if (stateblock->wineD3DDevice->vs_selected_mode != SHADER_NONE && stateblock->vertexShader && + ((IWineD3DVertexShaderImpl *)stateblock->vertexShader)->baseShader.function != NULL) + useVertexShaderFunction = TRUE; + + if(stateblock->wineD3DDevice->up_strided) { + + /* Note: this is a ddraw fixed-function code path */ + TRACE("================ Strided Input ===================\n"); + memcpy(&stateblock->wineD3DDevice->strided_streams, stateblock->wineD3DDevice->up_strided, sizeof(stateblock->wineD3DDevice->strided_streams)); + stateblock->wineD3DDevice->streamFixedUp = FALSE; + } + else if (stateblock->vertexDecl || stateblock->vertexShader) { + /* Note: This is a fixed function or shader codepath. + * This means it must handle both types of strided data. + * Shaders must go through here to zero the strided data, even if they + * don't set any declaration at all + */ + TRACE("================ Vertex Declaration ===================\n"); + memset(&stateblock->wineD3DDevice->strided_streams, 0, sizeof(stateblock->wineD3DDevice->strided_streams)); + + if (stateblock->vertexDecl != NULL || + ((IWineD3DVertexShaderImpl *)stateblock->vertexShader)->vertexDeclaration != NULL) { + + primitiveDeclarationConvertToStridedData((IWineD3DDevice *) stateblock->wineD3DDevice, useVertexShaderFunction, + &stateblock->wineD3DDevice->strided_streams, &stateblock->wineD3DDevice->streamFixedUp); + } + } else { + /* Note: This codepath is not reachable from d3d9 (see fvf->decl9 conversion) + * It is reachable through d3d8, but only for fixed-function. + * It will not work properly for shaders. + */ + TRACE("================ FVF ===================\n"); + memset(&stateblock->wineD3DDevice->strided_streams, 0, sizeof(stateblock->wineD3DDevice->strided_streams)); + primitiveConvertToStridedData((IWineD3DDevice *) stateblock->wineD3DDevice, &stateblock->wineD3DDevice->strided_streams, + &stateblock->wineD3DDevice->streamFixedUp); + } } const struct StateEntry StateTable[] = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9ca13c1..15958f3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -669,6 +669,7 @@ typedef struct IWineD3DDeviceImpl /* Stream source management */ WineDirect3DVertexStridedData strided_streams; WineDirect3DVertexStridedData *up_strided; + BOOL streamFixedUp; } IWineD3DDeviceImpl;

1 0

Alexandre Julliard : shlwapi: Use the appropriate constant for an uninitialized TLS check.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: efd0ba8dbc68c933bd12522f1c2add24ea06b8e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efd0ba8dbc68c933bd12522f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 3 11:02:25 2007 +0100 shlwapi: Use the appropriate constant for an uninitialized TLS check. --- dlls/shlwapi/thread.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/thread.c b/dlls/shlwapi/thread.c index 58888f7..3be58cc 100644 --- a/dlls/shlwapi/thread.c +++ b/dlls/shlwapi/thread.c @@ -180,7 +180,7 @@ HRESULT WINAPI SHSetThreadRef(IUnknown * { TRACE("(%p)\n", lpUnknown); - if (!lpUnknown || SHLWAPI_ThreadRef_index == 0xffffffff) + if (!lpUnknown || SHLWAPI_ThreadRef_index == TLS_OUT_OF_INDEXES) return E_NOINTERFACE; TlsSetValue(SHLWAPI_ThreadRef_index, lpUnknown);

1 0

Stefan Dösinger : wined3d: Pass the user pointer strided structure via the device implementation.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: 04ce141940598e33dbcd884e16df883d72e451f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ce141940598e33dbcd884e1… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Jan 2 21:13:28 2007 +0100 wined3d: Pass the user pointer strided structure via the device implementation. --- dlls/wined3d/device.c | 12 +++++++----- dlls/wined3d/drawprim.c | 7 +++---- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5a9fd22..7c31f66 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4699,7 +4699,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl if(StartVertex - This->stateBlock->baseVertexIndex < 0) ERR("Drawing negative\n"); /* Account for the loading offset due to index buffers. Instead of reloading all sources correct it with the startvertex parameter */ drawPrimitive(iface, PrimitiveType, PrimitiveCount, StartVertex - This->stateBlock->baseVertexIndex, 0/* NumVertices */, -1 /* indxStart */, - 0 /* indxSize */, NULL /* indxData */, 0 /* minIndex */, NULL); + 0 /* indxSize */, NULL /* indxData */, 0 /* minIndex */); return WINED3D_OK; } @@ -4728,7 +4728,7 @@ static HRESULT WINAPI IWineD3DDeviceIm } drawPrimitive(iface, PrimitiveType, primCount, 0, NumVertices, startIndex, - idxStride, ((IWineD3DIndexBufferImpl *) pIB)->resource.allocatedMemory, minIndex, NULL); + idxStride, ((IWineD3DIndexBufferImpl *) pIB)->resource.allocatedMemory, minIndex); return WINED3D_OK; } @@ -4753,7 +4753,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl This->stateBlock->streamIsUP = TRUE; drawPrimitive(iface, PrimitiveType, PrimitiveCount, -This->stateBlock->baseVertexIndex /* start vertex */, 0 /* NumVertices */, - 0 /* indxStart*/, 0 /* indxSize*/, NULL /* indxData */, 0 /* indxMin */, NULL); + 0 /* indxStart*/, 0 /* indxSize*/, NULL /* indxData */, 0 /* indxMin */); /* MSDN specifies stream zero settings must be set to NULL */ This->stateBlock->streamStride[0] = 0; @@ -4800,7 +4800,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl /* Set to 0 as per msdn. Do it now due to the stream source loading during drawPrimitive */ This->stateBlock->baseVertexIndex = 0; - drawPrimitive(iface, PrimitiveType, PrimitiveCount, 0 /* vertexStart */, NumVertices, 0 /* indxStart */, idxStride, pIndexData, MinVertexIndex, NULL); + drawPrimitive(iface, PrimitiveType, PrimitiveCount, 0 /* vertexStart */, NumVertices, 0 /* indxStart */, idxStride, pIndexData, MinVertexIndex); /* MSDN specifies stream zero settings and index buffer must be set to NULL */ This->stateBlock->streamSource[0] = NULL; @@ -4819,7 +4819,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl */ IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VDECL); This->stateBlock->baseVertexIndex = 0; - drawPrimitive(iface, PrimitiveType, PrimitiveCount, 0, 0, 0, 0, NULL, 0, DrawPrimStrideData); + This->up_strided = DrawPrimStrideData; + drawPrimitive(iface, PrimitiveType, PrimitiveCount, 0, 0, 0, 0, NULL, 0); + This->up_strided = NULL; return WINED3D_OK; } /* Yet another way to update a texture, some apps use this to load default textures instead of using surface/texture lock/unlock */ diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index b3cdb34..5dfc15b 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1936,8 +1936,7 @@ void drawPrimitive(IWineD3DDevice *iface long StartIdx, short idxSize, const void *idxData, - int minIndex, - WineDirect3DVertexStridedData *DrawPrimStrideData) { + int minIndex) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; BOOL useVertexShaderFunction = FALSE; @@ -1991,12 +1990,12 @@ void drawPrimitive(IWineD3DDevice *iface } This->depth_copy_state = WINED3D_DCS_INITIAL; - if(DrawPrimStrideData) { + if(This->up_strided) { /* Note: this is a ddraw fixed-function code path */ TRACE("================ Strided Input ===================\n"); - memcpy(&This->strided_streams, DrawPrimStrideData, sizeof(This->strided_streams)); + memcpy(&This->strided_streams, This->up_strided, sizeof(This->strided_streams)); drawPrimitiveTraceDataLocations(&This->strided_streams); fixup = FALSE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 37f4664..9ca13c1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -382,8 +382,7 @@ void drawPrimitive(IWineD3DDevice *iface long StartIdx, short idxBytes, const void *idxData, - int minIndex, - WineDirect3DVertexStridedData *DrawPrimStrideData); + int minIndex); void primitiveConvertToStridedData(IWineD3DDevice *iface, WineDirect3DVertexStridedData *strided, BOOL *fixup); @@ -669,6 +668,7 @@ typedef struct IWineD3DDeviceImpl /* Stream source management */ WineDirect3DVertexStridedData strided_streams; + WineDirect3DVertexStridedData *up_strided; } IWineD3DDeviceImpl;

1 0

Stefan Dösinger : wined3d: Use the baseVertexIndex in the stateblock.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: 71631f76384e130aa35e671ae5d78ed445ca517b URL: http://source.winehq.org/git/wine.git/?a=commit;h=71631f76384e130aa35e671ae… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Tue Jan 2 21:07:39 2007 +0100 wined3d: Use the baseVertexIndex in the stateblock. --- dlls/d3d8/d3d8_private.h | 3 -- dlls/d3d8/device.c | 11 ++----- dlls/d3d9/device.c | 7 +++- dlls/ddraw/device.c | 3 +- dlls/wined3d/device.c | 56 ++++++++++++++++++++++++++-------- dlls/wined3d/drawprim.c | 61 +++++++++++++++++-------------------- dlls/wined3d/vertexbuffer.c | 1 - dlls/wined3d/wined3d_private.h | 3 +- include/wine/wined3d_interface.h | 6 ++- 9 files changed, 85 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71631f76384e130aa35e6…

1 0

Robert Reif : dmusic: Implement just enough of IDirectMusicPortImpl_GetFormat
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: 0b0b72ec35be1655247cf7128835138f58420b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b0b72ec35be1655247cf7128… Author: Robert Reif <reif(a)earthlink.net> Date: Tue Jan 2 20:03:33 2007 -0500 dmusic: Implement just enough of IDirectMusicPortImpl_GetFormat to keep Direct Sound from crashing from unitialized data. --- dlls/dmusic/port.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 7329a87..63ee351 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -171,7 +171,45 @@ static HRESULT WINAPI IDirectMusicPortIm static HRESULT WINAPI IDirectMusicPortImpl_GetFormat (LPDIRECTMUSICPORT iface, LPWAVEFORMATEX pWaveFormatEx, LPDWORD pdwWaveFormatExSize, LPDWORD pdwBufferSize) { IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface; + WAVEFORMATEX format; FIXME("(%p, %p, %p, %p): stub\n", This, pWaveFormatEx, pdwWaveFormatExSize, pdwBufferSize); + + if (pWaveFormatEx == NULL) + { + if (pdwWaveFormatExSize) + *pdwWaveFormatExSize = sizeof(format); + else + return E_POINTER; + } + else + { + if (pdwWaveFormatExSize == NULL) + return E_POINTER; + + /* Just fill this in with something that will not crash Direct Sound for now. */ + /* It won't be used anyway until Performances are completed */ + format.wFormatTag = WAVE_FORMAT_PCM; + format.nChannels = 2; /* This->params.dwAudioChannels; */ + format.nSamplesPerSec = 44100; /* This->params.dwSampleRate; */ + format.wBitsPerSample = 16; /* FIXME: check this */ + format.nBlockAlign = (format.wBitsPerSample * format.nChannels) / 8; + format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign; + format.cbSize = 0; + + if (*pdwWaveFormatExSize >= sizeof(format)) + { + CopyMemory(pWaveFormatEx, &format, min(sizeof(format), *pdwWaveFormatExSize)); + *pdwWaveFormatExSize = sizeof(format); /* FIXME check if this is set */ + } + else + return E_POINTER; /* FIXME find right error */ + } + + if (pdwBufferSize) + *pdwBufferSize = 44100 * 2 * 2; + else + return E_POINTER; + return S_OK; }

1 0