Stefan Dösinger : wined3d: Actually store the PS' s vertex processing flag.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 335bd99262ca71a1e7763bbb126737d8a4f5d551
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=335bd99262ca71a1e7763bbb12...

Author: Stefan Dösinger <stefan(a)codeweavers.com>
Date:   Thu Nov  8 23:41:59 2007 +0100

wined3d: Actually store the PS's vertex processing flag.

---

 dlls/wined3d/pixelshader.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c
index 483c0ad..62a9fe6 100644
--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
@@ -361,18 +361,17 @@ static inline VOID IWineD3DPixelShaderImpl_GenerateShader(
         shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, &buffer, &GLINFO_LOCATION);
 
         /* Pack 3.0 inputs */
-        if (This->baseShader.hex_version >= WINED3DPS_VERSION(3,0) &&
-            !use_vs((IWineD3DDeviceImpl *) This->baseShader.device)) {
+        if (This->baseShader.hex_version >= WINED3DPS_VERSION(3,0)) {
 
             if(((IWineD3DDeviceImpl *) This->baseShader.device)->strided_streams.u.s.position_transformed) {
                 This->vertexprocessing = pretransformed;
+                pshader_glsl_input_pack(&buffer, This->semantics_in, iface);
             } else if(!use_vs((IWineD3DDeviceImpl *) This->baseShader.device)) {
                 This->vertexprocessing = fixedfunction;
+                pshader_glsl_input_pack(&buffer, This->semantics_in, iface);
             } else {
                 This->vertexprocessing = vertexshader;
             }
-
-            pshader_glsl_input_pack(&buffer, This->semantics_in, iface);
         }
 
         /* Base Shader Body */