[PATCH] WineD3D: Fix the unused arg marker=0A=

[Stefan Doesinger]

=0A=
---=0A=
 dlls/wined3d/arb_program_shader.c  |    2 +-=0A=
 dlls/wined3d/ati_fragment_shader.c |    2 +-=0A=
 dlls/wined3d/utils.c               |    5 ++---=0A=
 dlls/wined3d/wined3d_private.h     |    1 +=0A=
 4 files changed, 5 insertions(+), 5 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/arb_program_shader.c =
b/dlls/wined3d/arb_program_shader.c=0A=
index 21eb815..40f33e1 100644=0A=
--- a/dlls/wined3d/arb_program_shader.c=0A=
+++ b/dlls/wined3d/arb_program_shader.c=0A=
@@ -2369,7 +2369,7 @@ static void set_bumpmat_arbfp(DWORD state, =
IWineD3DStateBlockImpl *stateblock, W=0A=
 static const char *get_argreg(SHADER_BUFFER *buffer, DWORD argnum, =
unsigned int stage, DWORD arg) {=0A=
     const char *ret;=0A=
 =0A=
-    if(arg > WINED3DTOP_LERP) return "unused"; /* This is the marker =
for unused registers */=0A=
+    if(arg =3D=3D ARG_UNUSED) return "unused"; /* This is the marker =
for unused registers */=0A=
 =0A=
     switch(arg & WINED3DTA_SELECTMASK) {=0A=
         case WINED3DTA_DIFFUSE:=0A=
diff --git a/dlls/wined3d/ati_fragment_shader.c =
b/dlls/wined3d/ati_fragment_shader.c=0A=
index d6c133c..8e3ed18 100644=0A=
--- a/dlls/wined3d/ati_fragment_shader.c=0A=
+++ b/dlls/wined3d/ati_fragment_shader.c=0A=
@@ -153,7 +153,7 @@ static GLuint register_for_arg(DWORD arg, =
WineD3D_GL_Info *gl_info, unsigned int=0A=
     GLenum ret;=0A=
 =0A=
     if(mod) *mod =3D GL_NONE;=0A=
-    if(arg =3D=3D 0xFFFFFFFF) return -1; /* This is the marker for =
unused registers */=0A=
+    if(arg =3D=3D ARG_UNUSED) return -1; /* This is the marker for =
unused registers */=0A=
 =0A=
     switch(arg & WINED3DTA_SELECTMASK) {=0A=
         case WINED3DTA_DIFFUSE:=0A=
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c=0A=
index 6f3a447..e56b4b9 100644=0A=
--- a/dlls/wined3d/utils.c=0A=
+++ b/dlls/wined3d/utils.c=0A=
@@ -1817,9 +1817,8 @@ void gen_ffp_op(IWineD3DStateBlockImpl =
*stateblock, struct ffp_settings *setting=0A=
         if(stateblock->textureState[i][WINED3DTSS_COLOROP] =3D=3D =
WINED3DTOP_DISABLE) {=0A=
             settings->op[i].cop =3D WINED3DTOP_DISABLE;=0A=
             settings->op[i].aop =3D WINED3DTOP_DISABLE;=0A=
-            /* 0x3F: set all 6 bits of the args to 1 */=0A=
-            settings->op[i].carg0 =3D settings->op[i].carg1 =3D =
settings->op[i].carg2 =3D 0x3F;=0A=
-            settings->op[i].aarg0 =3D settings->op[i].aarg1 =3D =
settings->op[i].aarg2 =3D 0x3F;=0A=
+            settings->op[i].carg0 =3D settings->op[i].carg1 =3D =
settings->op[i].carg2 =3D ARG_UNUSED;=0A=
+            settings->op[i].aarg0 =3D settings->op[i].aarg1 =3D =
settings->op[i].aarg2 =3D ARG_UNUSED;=0A=
             settings->op[i].color_correction =3D WINED3DFMT_UNKNOWN;=0A=
             settings->op[i].dst =3D resultreg;=0A=
             settings->op[i].tex_type =3D tex_1d;=0A=
diff --git a/dlls/wined3d/wined3d_private.h =
b/dlls/wined3d/wined3d_private.h=0A=
index e4c6a41..e2b1215 100644=0A=
--- a/dlls/wined3d/wined3d_private.h=0A=
+++ b/dlls/wined3d/wined3d_private.h=0A=
@@ -760,6 +760,7 @@ enum dst_arg=0A=
 struct texture_stage_op=0A=
 {=0A=
     unsigned                cop : 5, aop : 5;=0A=
+#define ARG_UNUSED          0x3f=0A=
     unsigned                carg1 : 6, carg2 : 6, carg0 : 6;=0A=
     unsigned                tex_type : 3;=0A=
     unsigned                dst : 1;                        /* Total of =
32 bits */=0A=
-- =0A=
1.5.4.5=0A=
=0A=

------=_NextPart_000_0001_01C901F1.80DCF440--