[PATCH] WineD3D: Fix ARG_UNUSED and use it properly=0A=

Stefan Doesinger stefan at codeweavers.com
Tue Dec 9 20:02:18 CST 2008


=0A=
---=0A=
 dlls/wined3d/utils.c           |   20 ++++++++++----------=0A=
 dlls/wined3d/wined3d_private.h |    2 +-=0A=
 2 files changed, 11 insertions(+), 11 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c=0A=
index 0eb5337..4e46013 100644=0A=
--- a/dlls/wined3d/utils.c=0A=
+++ b/dlls/wined3d/utils.c=0A=
@@ -1957,14 +1957,14 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl =
*stateblock, struct ffp_frag_setting=0A=
         cop =3D stateblock->textureState[i][WINED3DTSS_COLOROP];=0A=
         aop =3D stateblock->textureState[i][WINED3DTSS_ALPHAOP];=0A=
 =0A=
-        carg1 =3D (args[cop] & ARG1) ? =
stateblock->textureState[i][WINED3DTSS_COLORARG1] : 0xffffffff;=0A=
-        carg2 =3D (args[cop] & ARG2) ? =
stateblock->textureState[i][WINED3DTSS_COLORARG2] : 0xffffffff;=0A=
-        carg0 =3D (args[cop] & ARG0) ? =
stateblock->textureState[i][WINED3DTSS_COLORARG0] : 0xffffffff;=0A=
+        carg1 =3D (args[cop] & ARG1) ? =
stateblock->textureState[i][WINED3DTSS_COLORARG1] : ARG_UNUSED;=0A=
+        carg2 =3D (args[cop] & ARG2) ? =
stateblock->textureState[i][WINED3DTSS_COLORARG2] : ARG_UNUSED;=0A=
+        carg0 =3D (args[cop] & ARG0) ? =
stateblock->textureState[i][WINED3DTSS_COLORARG0] : ARG_UNUSED;=0A=
 =0A=
         if(is_invalid_op(stateblock->wineD3DDevice, i, cop,=0A=
                          carg1, carg2, carg0)) {=0A=
-            carg0 =3D 0xffffffff;=0A=
-            carg2 =3D 0xffffffff;=0A=
+            carg0 =3D ARG_UNUSED;=0A=
+            carg2 =3D ARG_UNUSED;=0A=
             carg1 =3D WINED3DTA_CURRENT;=0A=
             cop =3D WINED3DTOP_SELECTARG1;=0A=
         }=0A=
@@ -1978,9 +1978,9 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl =
*stateblock, struct ffp_frag_setting=0A=
             aarg2 =3D carg2;=0A=
             aarg0 =3D carg0;=0A=
         } else {=0A=
-            aarg1 =3D (args[aop] & ARG1) ? =
stateblock->textureState[i][WINED3DTSS_ALPHAARG1] : 0xffffffff;=0A=
-            aarg2 =3D (args[aop] & ARG2) ? =
stateblock->textureState[i][WINED3DTSS_ALPHAARG2] : 0xffffffff;=0A=
-            aarg0 =3D (args[aop] & ARG0) ? =
stateblock->textureState[i][WINED3DTSS_ALPHAARG0] : 0xffffffff;=0A=
+            aarg1 =3D (args[aop] & ARG1) ? =
stateblock->textureState[i][WINED3DTSS_ALPHAARG1] : ARG_UNUSED;=0A=
+            aarg2 =3D (args[aop] & ARG2) ? =
stateblock->textureState[i][WINED3DTSS_ALPHAARG2] : ARG_UNUSED;=0A=
+            aarg0 =3D (args[aop] & ARG0) ? =
stateblock->textureState[i][WINED3DTSS_ALPHAARG0] : ARG_UNUSED;=0A=
         }=0A=
 =0A=
         if(i =3D=3D 0 && stateblock->textures[0] &&=0A=
@@ -2015,8 +2015,8 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl =
*stateblock, struct ffp_frag_setting=0A=
 =0A=
         if(is_invalid_op(stateblock->wineD3DDevice, i, aop,=0A=
            aarg1, aarg2, aarg0)) {=0A=
-               aarg0 =3D 0xffffffff;=0A=
-               aarg2 =3D 0xffffffff;=0A=
+               aarg0 =3D ARG_UNUSED;=0A=
+               aarg2 =3D ARG_UNUSED;=0A=
                aarg1 =3D WINED3DTA_CURRENT;=0A=
                aop =3D WINED3DTOP_SELECTARG1;=0A=
         }=0A=
diff --git a/dlls/wined3d/wined3d_private.h =
b/dlls/wined3d/wined3d_private.h=0A=
index 8e0e0ec..6f84803 100644=0A=
--- a/dlls/wined3d/wined3d_private.h=0A=
+++ b/dlls/wined3d/wined3d_private.h=0A=
@@ -921,7 +921,7 @@ enum dst_arg=0A=
 =
/************************************************************************=
*****=0A=
  * Fixed function pipeline replacements=0A=
  */=0A=
-#define ARG_UNUSED          0x3f=0A=
+#define ARG_UNUSED          0xff=0A=
 struct texture_stage_op=0A=
 {=0A=
     unsigned                cop : 8;=0A=
-- =0A=
1.5.6.4=0A=
=0A=

------=_NextPart_000_0019_01C95B87.62FF2250--




More information about the wine-patches mailing list