diff options
| author | Laura Ekstrand <[email protected]> | 2014-12-09 13:40:45 -0800 |
|---|---|---|
| committer | Laura Ekstrand <[email protected]> | 2015-01-08 11:37:30 -0800 |
| commit | 50d679381d2cd2413f2c3d4098b81f9c04d5de18 (patch) | |
| tree | 0d6be3ba48451f398ae17ce00d3c8d400776aeed | |
| parent | 98e64e538afeaa800e1cdcbc7ce5d5093b274fe7 (diff) | |
main: Refactor in teximage.c to handle NULL from _mesa_get_current_tex_object.
Reviewed-by: Anuj Phogat <[email protected]>
| -rw-r--r-- | src/mesa/main/teximage.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 2f2f072c8e1..d95967cc28e 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1871,6 +1871,9 @@ static GLboolean mutable_tex_object(struct gl_context *ctx, GLenum target) { struct gl_texture_object *texObj = _mesa_get_current_tex_object(ctx, target); + if (!texObj) + return GL_FALSE; + return !texObj->Immutable; } @@ -3373,6 +3376,9 @@ _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image) _mesa_update_state(ctx); texObj = _mesa_get_current_tex_object(ctx, target); + if (!texObj) + return; + _mesa_lock_texture(ctx, texObj); if (texObj->Immutable) { @@ -3469,7 +3475,11 @@ texsubimage(struct gl_context *ctx, GLuint dims, GLenum target, GLint level, { struct gl_texture_object *texObj; struct gl_texture_image *texImage; + texObj = _mesa_get_current_tex_object(ctx, target); + if (!texObj) + return; + if (texsubimage_error_check(ctx, dims, texObj, target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, false)) { @@ -5276,7 +5286,10 @@ _mesa_TexImage2DMultisample(GLenum target, GLsizei samples, { struct gl_texture_object *texObj; GET_CURRENT_CONTEXT(ctx); + texObj = _mesa_get_current_tex_object(ctx, target); + if (!texObj) + return; _mesa_texture_image_multisample(ctx, 2, texObj, target, samples, internalformat, width, height, 1, @@ -5293,7 +5306,10 @@ _mesa_TexImage3DMultisample(GLenum target, GLsizei samples, { struct gl_texture_object *texObj; GET_CURRENT_CONTEXT(ctx); + texObj = _mesa_get_current_tex_object(ctx, target); + if (!texObj) + return; _mesa_texture_image_multisample(ctx, 3, texObj, target, samples, internalformat, width, height, depth, @@ -5309,7 +5325,10 @@ _mesa_TexStorage2DMultisample(GLenum target, GLsizei samples, { struct gl_texture_object *texObj; GET_CURRENT_CONTEXT(ctx); + texObj = _mesa_get_current_tex_object(ctx, target); + if (!texObj) + return; _mesa_texture_image_multisample(ctx, 2, texObj, target, samples, internalformat, width, height, 1, @@ -5325,7 +5344,10 @@ _mesa_TexStorage3DMultisample(GLenum target, GLsizei samples, { struct gl_texture_object *texObj; GET_CURRENT_CONTEXT(ctx); + texObj = _mesa_get_current_tex_object(ctx, target); + if (!texObj) + return; _mesa_texture_image_multisample(ctx, 3, texObj, target, samples, internalformat, width, height, depth, |