Henri Verbeet : wined3d: Make sure some variables are always initialized.
Alexandre Julliard
julliard at winehq.org
Thu Oct 9 07:42:37 CDT 2008
Module: wine
Branch: master
Commit: 3643d59d5bda160a605cbfb6263eb716893fb0d1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3643d59d5bda160a605cbfb6263eb716893fb0d1
Author: Henri Verbeet <hverbeet at gmail.com>
Date: Wed Oct 8 17:34:51 2008 +0200
wined3d: Make sure some variables are always initialized.
---
dlls/wined3d/ati_fragment_shader.c | 6 +++++-
dlls/wined3d/glsl_shader.c | 1 +
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c
index 20c4ebe..7e3225b 100644
--- a/dlls/wined3d/ati_fragment_shader.c
+++ b/dlls/wined3d/ati_fragment_shader.c
@@ -163,7 +163,11 @@ static GLuint register_for_arg(DWORD arg, WineD3D_GL_Info *gl_info, unsigned int
GLenum ret;
if(mod) *mod = GL_NONE;
- if(arg == ARG_UNUSED) return -1; /* This is the marker for unused registers */
+ if(arg == ARG_UNUSED)
+ {
+ if (rep) *rep = GL_NONE;
+ return -1; /* This is the marker for unused registers */
+ }
switch(arg & WINED3DTA_SELECTMASK) {
case WINED3DTA_DIFFUSE:
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 057826d..b73d894 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -1219,6 +1219,7 @@ static void shader_glsl_get_sample_function(DWORD sampler_type, BOOL projected,
break;
default:
sample_function->name = "";
+ sample_function->coord_mask = 0;
FIXME("Unrecognized sampler type: %#x;\n", sampler_type);
break;
}
More information about the wine-cvs
mailing list