[PATCH] WineD3D: Fix the MULTIPLYADD parameter orders in atifs=0A=

Stefan Doesinger stefan at codeweavers.com
Mon Jul 7 17:06:33 CDT 2008


=0A=
---=0A=
 dlls/wined3d/ati_fragment_shader.c |   16 ++++++++--------=0A=
 1 files changed, 8 insertions(+), 8 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/ati_fragment_shader.c =
b/dlls/wined3d/ati_fragment_shader.c=0A=
index 12e40ae..3dc3d2a 100644=0A=
--- a/dlls/wined3d/ati_fragment_shader.c=0A=
+++ b/dlls/wined3d/ati_fragment_shader.c=0A=
@@ -577,13 +577,13 @@ static GLuint gen_ati_shader(struct =
texture_stage_op op[MAX_TEXTURES], WineD3D_G=0A=
             case WINED3DTOP_MULTIPLYADD:=0A=
                 TRACE("glColorFragmentOp3ATI(GL_MAD_ATI, %s, GL_NONE, =
GL_NONE, %s, GL_NONE, %s, %s, GL_NONE, %s, %s, GL_NONE, %s)\n",=0A=
                       debug_register(dstreg),=0A=
-                      debug_register(arg0), debug_argmod(argmod0),=0A=
+                      debug_register(arg1), debug_argmod(argmod1),=0A=
                       debug_register(arg2), debug_argmod(argmod2),=0A=
-                      debug_register(arg1), debug_argmod(argmod1));=0A=
+                      debug_register(arg0), debug_argmod(argmod0));=0A=
                 GL_EXTCALL(glColorFragmentOp3ATI(GL_MAD_ATI, dstreg, =
GL_NONE, GL_NONE,=0A=
-                                                 arg0, GL_NONE, argmod0,=0A=
+                                                 arg1, GL_NONE, argmod1,=0A=
                                                  arg2, GL_NONE, argmod2,=0A=
-                                                 arg1, GL_NONE, =
argmod1));=0A=
+                                                 arg0, GL_NONE, =
argmod0));=0A=
                 break;=0A=
 =0A=
             case WINED3DTOP_LERP:=0A=
@@ -735,13 +735,13 @@ static GLuint gen_ati_shader(struct =
texture_stage_op op[MAX_TEXTURES], WineD3D_G=0A=
             case WINED3DTOP_MULTIPLYADD:=0A=
                 TRACE("glAlphaFragmentOp3ATI(GL_MAD_ATI, %s,          =
GL_NONE, %s, GL_NONE, %s, %s, GL_NONE, %s, %s, GL_NONE, %s)\n",=0A=
                       debug_register(dstreg),=0A=
-                      debug_register(arg0), debug_argmod(argmod0),=0A=
+                      debug_register(arg1), debug_argmod(argmod1),=0A=
                       debug_register(arg2), debug_argmod(argmod2),=0A=
-                      debug_register(arg1), debug_argmod(argmod1));=0A=
+                      debug_register(arg0), debug_argmod(argmod0));=0A=
                 GL_EXTCALL(glAlphaFragmentOp3ATI(GL_MAD_ATI, dstreg,    =
      GL_NONE,=0A=
-                           arg0, GL_NONE, argmod0,=0A=
+                           arg1, GL_NONE, argmod1,=0A=
                            arg2, GL_NONE, argmod2,=0A=
-                           arg1, GL_NONE, argmod1));=0A=
+                           arg0, GL_NONE, argmod0));=0A=
                 break;=0A=
 =0A=
             case WINED3DTOP_LERP:=0A=
-- =0A=
1.5.4.5=0A=
=0A=

------=_NextPart_000_002E_01C8E844.E28CD640--




More information about the wine-patches mailing list