Henri Verbeet : wined3d: vertexshader should never be NULL in generate_param_reorder_function() ( LLVM/Clang).

Alexandre Julliard julliard at winehq.org
Mon Nov 3 09:06:23 CST 2008


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Fri Oct 31 16:21:22 2008 +0100

wined3d: vertexshader should never be NULL in generate_param_reorder_function() (LLVM/Clang).

---

 dlls/wined3d/glsl_shader.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index fc57329..22176e9 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -3043,7 +3043,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs
     IWineD3DVertexShaderImpl *vs = (IWineD3DVertexShaderImpl *) vertexshader;
     IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *) pixelshader;
     IWineD3DDeviceImpl *device;
-    DWORD vs_major = vs ? WINED3DSHADER_VERSION_MAJOR(vs->baseShader.hex_version) : 0;
+    DWORD vs_major = WINED3DSHADER_VERSION_MAJOR(vs->baseShader.hex_version);
     DWORD ps_major = ps ? WINED3DSHADER_VERSION_MAJOR(ps->baseShader.hex_version) : 0;
     unsigned int i;
     SHADER_BUFFER buffer;




More information about the wine-cvs mailing list