From: Neil Roberts Date: Wed, 25 Feb 2015 15:10:01 +0000 (+0000) Subject: meta: In pbo_{Get,}TexSubImage don't repeatedly rebind the source tex X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a44606eb8164be2aa37eb288fd90894d74bd0935;p=mesa.git meta: In pbo_{Get,}TexSubImage don't repeatedly rebind the source tex A layered PBO image is now interpreted as a single tall 2D image so the z argument in _mesa_meta_bind_fbo_image is ignored. Therefore this was just redundantly rebinding the same image repeatedly. Reviewed-by: Jason Ekstrand --- diff --git a/src/mesa/drivers/common/meta_tex_subimage.c b/src/mesa/drivers/common/meta_tex_subimage.c index a8513573b1b..5ae12c8a115 100644 --- a/src/mesa/drivers/common/meta_tex_subimage.c +++ b/src/mesa/drivers/common/meta_tex_subimage.c @@ -226,8 +226,6 @@ _mesa_meta_pbo_TexSubImage(struct gl_context *ctx, GLuint dims, height : depth; for (z = 1; z < iters; z++) { - _mesa_meta_bind_fbo_image(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, - pbo_tex_image, z); _mesa_meta_bind_fbo_image(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex_image, zoffset + z); @@ -359,8 +357,6 @@ _mesa_meta_pbo_GetTexSubImage(struct gl_context *ctx, GLuint dims, for (z = 1; z < iters; z++) { _mesa_meta_bind_fbo_image(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, tex_image, zoffset + z); - _mesa_meta_bind_fbo_image(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, - pbo_tex_image, z); _mesa_update_state(ctx);