Mesa (master): mesa: remove redundant NULL check
Timothy Arceri
tarceri at kemper.freedesktop.org
Mon Jun 26 22:15:22 UTC 2017
Module: Mesa
Branch: master
Commit: 3034c4c7251bca68e68fbc1e71ec5ee7c7ae0d30
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3034c4c7251bca68e68fbc1e71ec5ee7c7ae0d30
Author: Timothy Arceri <tarceri at itsqueeze.com>
Date: Mon Jun 26 12:38:22 2017 +1000
mesa: remove redundant NULL check
This can never be NULL in any of the entry paths.
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
---
src/mesa/main/teximage.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 9d39759c3d..a039747205 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2504,6 +2504,8 @@ copytexsubimage_error_check(struct gl_context *ctx, GLuint dimensions,
GLint xoffset, GLint yoffset, GLint zoffset,
GLint width, GLint height, const char *caller)
{
+ assert(texObj);
+
struct gl_texture_image *texImage;
/* Check that the source buffer is complete */
@@ -2530,12 +2532,6 @@ copytexsubimage_error_check(struct gl_context *ctx, GLuint dimensions,
return GL_TRUE;
}
- /* Get dest image pointers */
- if (!texObj) {
- _mesa_error(ctx, GL_OUT_OF_MEMORY, "%s()", caller);
- return GL_TRUE;
- }
-
texImage = _mesa_select_tex_image(texObj, target, level);
if (!texImage) {
/* destination image does not exist */
More information about the mesa-commit
mailing list