Stefan Dösinger : wined3d: Initialize the texture op function properly.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 228f2cf3c22124958a0f049a4463718a96267a7d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=228f2cf3c22124958a0f049a44...

Author: Stefan Dösinger 
Date:   Fri Aug  1 11:47:24 2008 -0500

wined3d: Initialize the texture op function properly.

---

dlls/wined3d/utils.c           |    3 +++
 dlls/wined3d/wined3d_private.h |    3 ++-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index a9fc780..98f7eef 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -1792,6 +1792,7 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *setting

for(i = 0; i < GL_LIMITS(texture_stages); i++) {
         IWineD3DBaseTextureImpl *texture;
+        settings->op[i].padding = 0;
         if(stateblock->textureState[i][WINED3DTSS_COLOROP] == WINED3DTOP_DISABLE) {
             settings->op[i].cop = WINED3DTOP_DISABLE;
             settings->op[i].aop = WINED3DTOP_DISABLE;
@@ -1800,6 +1801,8 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *setting
             settings->op[i].aarg0 = settings->op[i].aarg1 = settings->op[i].aarg2 = 0x3F;
             settings->op[i].color_correction = WINED3DFMT_UNKNOWN;
             settings->op[i].dst = resultreg;
+            settings->op[i].tex_type = tex_1d;
+            settings->op[i].projected = proj_none;
             i++;
             break;
         }
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 7ba6617..453c92a 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -745,9 +745,10 @@ struct texture_stage_op
     unsigned                cop : 5, aop : 5;
     unsigned                carg1 : 6, carg2 : 6, carg0 : 6;
     unsigned                tex_type : 3;
-    unsigned                dst : 1;
+    unsigned                dst : 1;                        /* Total of 32 bits */
     unsigned                aarg1 : 6, aarg2 : 6, aarg0 : 6;
     unsigned                projected : 2;
+    unsigned                padding : 12;                   /* Total of 64 bits */
     WINED3DFORMAT           color_correction;
 };