Henri Verbeet : wined3d: Make use_vs() safe to call from IWineD3DDeviceImpl_FindTexUnitMap().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 92b66ac82cced7170821bd8d5abff5083b451bb9
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=92b66ac82cced7170821bd8d5a...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Wed Aug 19 10:55:35 2009 +0200

wined3d: Make use_vs() safe to call from IWineD3DDeviceImpl_FindTexUnitMap().

---

 dlls/wined3d/wined3d_private.h |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 514c9a9..44bb10e 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -2885,8 +2885,12 @@ const struct GlPixelFormatDesc *getFormatDescEntry(WINED3DFORMAT fmt, const stru
 
 static inline BOOL use_vs(IWineD3DStateBlockImpl *stateblock)
 {
+    /* Check stateblock->vertexDecl to allow this to be used from
+     * IWineD3DDeviceImpl_FindTexUnitMap(). This is safe because
+     * stateblock->vertexShader implies a vertex declaration instead of ddraw
+     * style strided data. */
     return (stateblock->vertexShader
-            && !stateblock->wineD3DDevice->strided_streams.position_transformed
+            && !((IWineD3DVertexDeclarationImpl *)stateblock->vertexDecl)->position_transformed
             && stateblock->wineD3DDevice->vs_selected_mode != SHADER_NONE);
 }