H. Verbeet : wined3d: Fix a few TRACEs in pixelshader.c.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 12805f08aac1b619df3ac9668da8cd218775ce02
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=12805f08aac1b619df3ac966...

Author: H. Verbeet 
Date:   Fri Jan 20 16:13:57 2006 +0100

wined3d: Fix a few TRACEs in pixelshader.c.

---

dlls/wined3d/pixelshader.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c
index 21cc284..a202942 100644
--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
@@ -864,7 +864,7 @@ inline static void addline(unsigned int 
     }

*pgmLength += lineLen;
-    ++lineNum;
+    ++(*lineNum);
     TRACE("GL HW (%u, %u) : %s", *lineNum, *pgmLength, line);
 }

@@ -1095,7 +1095,6 @@ inline static VOID IWineD3DPixelShaderIm
 #endif
             pInstr = pToken;
             curOpcode = pshader_program_get_opcode(*pToken, version);
-            TRACE("Found opcode %s %s\n", curOpcode->name,curOpcode->glname);
             ++pToken;
             if (NULL == curOpcode) {
                 /* unknown current opcode ... (shouldn't be any!) */
@@ -1108,6 +1107,7 @@ inline static VOID IWineD3DPixelShaderIm
                 FIXME("Token %s requires greater functionality than Fragment_Progarm_ARB supports\n", curOpcode->name);
                 pToken += curOpcode->num_params;
             } else {
+                TRACE("Found opcode %s %s\n", curOpcode->name, curOpcode->glname);
                 saturate = FALSE;

/* Build opcode for GL vertex_program */
@@ -1399,7 +1399,7 @@ inline static VOID IWineD3DPixelShaderIm
                     case D3DSPDM_D8: D8 = TRUE; break;
 #endif
                     default:
-                        TRACE("_unhandled_modifier(0x%08lx)", mask);
+                        TRACE("_unhandled_modifier(0x%08lx)\n", mask);
                     }
                 }

@@ -1491,9 +1491,14 @@ inline static VOID IWineD3DPixelShaderIm
     /* finally null terminate the pgmStr*/
     pgmStr[pgmLength] = 0;
     if (GL_SUPPORT(ARB_VERTEX_PROGRAM)) {
-        TRACE("(%p) : Generated program %s\n", This, pgmStr);
         /*  Create the hw shader */

+        /* pgmStr sometimes gets too long for a normal TRACE */
+        TRACE("Generated program:\n");
+        if (TRACE_ON(d3d_shader)) {
+            fprintf(stderr, "%s\n", pgmStr);
+        }
+
         /* TODO: change to resource.glObjectHandel or something like that */
         GL_EXTCALL(glGenProgramsARB(1, &This->prgId));