From 8b7607d28a4d0db43a9bc5618d7f6ff44daa0dc2 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Fri, 8 Jul 2016 12:35:11 -0400 Subject: [PATCH] meta/texsubimage: tex_image is always non-null, avoid confusing code Probably a copy-paste from mesa_meta_pbo_GetTexSubImage where tex_image may apparently be null. Signed-off-by: Ilia Mirkin Reviewed-by: Eric Engestrom --- src/mesa/drivers/common/meta_tex_subimage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/drivers/common/meta_tex_subimage.c b/src/mesa/drivers/common/meta_tex_subimage.c index 988af91..703efcd 100644 --- a/src/mesa/drivers/common/meta_tex_subimage.c +++ b/src/mesa/drivers/common/meta_tex_subimage.c @@ -235,7 +235,7 @@ _mesa_meta_pbo_TexSubImage(struct gl_context *ctx, GLuint dims, if (drawFb == NULL) goto fail; - _mesa_bind_framebuffers(ctx, drawFb, tex_image ? readFb : ctx->ReadBuffer); + _mesa_bind_framebuffers(ctx, drawFb, readFb); if (tex_image->TexObject->Target == GL_TEXTURE_1D_ARRAY) { assert(depth == 1); -- 2.7.4