Mesa (master): meta: In pbo_{Get,}TexSubImage don' t repeatedly rebind the source tex

[Neil Roberts]

Module: Mesa
Branch: master
Commit: a44606eb8164be2aa37eb288fd90894d74bd0935
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a44606eb8164be2aa37eb288fd90894d74bd0935

Author: Neil Roberts <neil at linux.intel.com>
Date:   Wed Feb 25 15:10:01 2015 +0000

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 <jason.ekstrand at intel.com>

---

 src/mesa/drivers/common/meta_tex_subimage.c |    4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/mesa/drivers/common/meta_tex_subimage.c b/src/mesa/drivers/common/meta_tex_subimage.c
index a851357..5ae12c8 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);