wined3d: Remove '\0's in traces.

Francois Gouget fgouget at free.fr
Sun Oct 15 10:06:44 CDT 2006


---

shader_addline() is a wrapper around TRACE() and thus must follow the 
same rules.

 dlls/wined3d/pixelshader.c  |    4 ++--
 dlls/wined3d/vertexshader.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c
index 6911a90..7b19d63 100644
--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
@@ -860,7 +860,7 @@ #endif
             else
                 shader_addline(&buffer, "gl_FragColor = R0;\n");
         }
-        shader_addline(&buffer, "}\n\0");
+        shader_addline(&buffer, "}\n");
 
         TRACE("Compiling shader object %u\n", shader_obj);
         GL_EXTCALL(glShaderSourceARB(shader_obj, 1, (const char**)&buffer.buffer, NULL));
@@ -891,7 +891,7 @@ #endif
 
         if (This->baseShader.hex_version < WINED3DPS_VERSION(2,0))
             shader_addline(&buffer, "MOV result.color, R0;\n");
-        shader_addline(&buffer, "END\n\0"); 
+        shader_addline(&buffer, "END\n"); 
 
         /* TODO: change to resource.glObjectHandle or something like that */
         GL_EXTCALL(glGenProgramsARB(1, &This->baseShader.prgId));
diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c
index 14ea00c..d48be44 100644
--- a/dlls/wined3d/vertexshader.c
+++ b/dlls/wined3d/vertexshader.c
@@ -750,7 +750,7 @@ #endif
          */
         shader_addline(&buffer, "gl_Position.y = gl_Position.y * posFixup[1];\n");
 
-        shader_addline(&buffer, "}\n\0");
+        shader_addline(&buffer, "}\n");
 
         TRACE("Compiling shader object %u\n", shader_obj);
         GL_EXTCALL(glShaderSourceARB(shader_obj, 1, (const char**)&buffer.buffer, NULL));
@@ -803,7 +803,7 @@ #endif
 
         shader_addline(&buffer, "MOV result.position, TMP_OUT;\n");
         
-        shader_addline(&buffer, "END\n\0"); 
+        shader_addline(&buffer, "END\n"); 
 
         /* TODO: change to resource.glObjectHandle or something like that */
         GL_EXTCALL(glGenProgramsARB(1, &This->baseShader.prgId));
-- 
1.4.1.1




More information about the wine-patches mailing list