Stefan Dösinger : wined3d: Fix the MULTIPLYADD parameter orders in atifs.

Alexandre Julliard julliard at winehq.org
Fri Jul 18 06:46:42 CDT 2008


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

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Mon Jul  7 17:06:33 2008 -0500

wined3d: Fix the MULTIPLYADD parameter orders in atifs.

---

 dlls/wined3d/ati_fragment_shader.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

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




More information about the wine-cvs mailing list