diff options
| author | marha <marha@users.sourceforge.net> | 2011-08-08 13:41:53 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-08-08 13:41:53 +0200 |
| commit | 0c2b3e6fd26158cb97f4210cc891e218801b4b25 (patch) | |
| tree | cd9cabb6972dab80fa1278aebb17704dcc34d8ba /mesalib/src/mesa/main | |
| parent | d105412503ea250e07d3cb008f10f60e6e48bf8a (diff) | |
| download | vcxsrv-0c2b3e6fd26158cb97f4210cc891e218801b4b25.tar.gz vcxsrv-0c2b3e6fd26158cb97f4210cc891e218801b4b25.tar.bz2 vcxsrv-0c2b3e6fd26158cb97f4210cc891e218801b4b25.zip | |
mesa xkeyboard-config git update 8 aug 2011
Diffstat (limited to 'mesalib/src/mesa/main')
| -rw-r--r-- | mesalib/src/mesa/main/mtypes.h | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/shaderapi.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index b88118366..2d5f44c1e 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -2252,8 +2252,6 @@ struct gl_shader_state */ struct gl_shader_program *ActiveProgram; - void *MemPool; - GLbitfield Flags; /**< Mask of GLSL_x flags */ }; diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c index 8df25c3f9..74997eaaa 100644 --- a/mesalib/src/mesa/main/shaderapi.c +++ b/mesalib/src/mesa/main/shaderapi.c @@ -1125,7 +1125,7 @@ static void validate_program(struct gl_context *ctx, GLuint program) { struct gl_shader_program *shProg; - char errMsg[100]; + char errMsg[100] = ""; shProg = _mesa_lookup_shader_program_err(ctx, program, "glValidateProgram"); if (!shProg) { |