[Mesa-dev] [PATCH] meta/texsubimage: tex_image is always non-null, avoid confusing code

Ilia Mirkin imirkin at alum.mit.edu
Fri Jul 8 16:35:11 UTC 2016


Probably a copy-paste from mesa_meta_pbo_GetTexSubImage where tex_image
may apparently be null.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
---

Happened upon this when trying to figure out the "incomplete fbo" issue.

 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.3



More information about the mesa-dev mailing list