diff options
author | Brian Paul <[email protected]> | 2010-08-27 14:35:52 -0600 |
---|---|---|
committer | Brian Paul <[email protected]> | 2010-08-27 14:35:52 -0600 |
commit | 9ce0d92ae70362a1cd8c07c9f7ac25bcbcd09959 (patch) | |
tree | e581c82fac74f99b7abc3076b0cc3b0e73f22742 /src/mesa | |
parent | f57df7f2130dfe20a6f7e75cfc1f5d4e1717d098 (diff) |
mesa: move null ptr check (fdo bug 29843)
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/main/shaderobj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c index 65d8d116db1..59198d788bd 100644 --- a/src/mesa/main/shaderobj.c +++ b/src/mesa/main/shaderobj.c @@ -104,9 +104,9 @@ _mesa_new_shader(GLcontext *ctx, GLuint name, GLenum type) assert(type == GL_FRAGMENT_SHADER || type == GL_VERTEX_SHADER || type == GL_GEOMETRY_SHADER_ARB); shader = talloc_zero(NULL, struct gl_shader); - shader->Type = type; - shader->Name = name; if (shader) { + shader->Type = type; + shader->Name = name; _mesa_init_shader(ctx, shader); } return shader; |