[WINED3D 5/9] Trivial cleanups

Ivan Gyurdiev ivg231 at gmail.com
Mon Jun 12 01:56:13 CDT 2006


- compiler warnings and errors should be FIXME
- remove obsolete comment, and change variable type.

-------------- next part --------------
---

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

467e26edb0c2e4acf560a1d12ec2558c6d643d4c
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index afcec1c..9cc3f2b 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -42,7 +42,7 @@ void print_glsl_info_log(WineD3D_GL_Info
     {
         infoLog = (char *)HeapAlloc(GetProcessHeap(), 0, infologLength);
         GL_EXTCALL(glGetInfoLogARB(obj, infologLength, NULL, infoLog));
-        TRACE("Error received from GLSL shader #%u: %s\n", obj, debugstr_a(infoLog));
+        FIXME("Error received from GLSL shader #%u: %s\n", obj, debugstr_a(infoLog));
         HeapFree(GetProcessHeap(), 0, infoLog);
     }
 }
@@ -166,7 +166,7 @@ static void shader_glsl_get_register_nam
     DWORD reg = param & D3DSP_REGNUM_MASK;
     DWORD regtype = shader_get_regtype(param);
     IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) arg->shader;
-    BOOL pshader = shader_is_pshader_version(This->baseShader.hex_version);
+    char pshader = shader_is_pshader_version(This->baseShader.hex_version);
     char tmpStr[50];
 
     *is_color = FALSE;   
diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c
index 7312811..cf01e50 100644
--- a/dlls/wined3d/pixelshader.c
+++ b/dlls/wined3d/pixelshader.c
@@ -83,12 +83,6 @@ static ULONG  WINAPI IWineD3DPixelShader
     return ref;
 }
 
-/* TODO: At the momeny the function parser is single pass, it achievs this 
-   by passing constants to a couple of functions where they are then modified.
-   At some point the parser need to be made two pass (So that GLSL can be used if it's required by the shader)
-   when happens constants should be worked out in the first pass to tidy up the second pass a bit.
-*/
-
 /* *******************************************
    IWineD3DPixelShader IWineD3DPixelShader parts follow
    ******************************************* */
-- 
1.3.3



More information about the wine-patches mailing list