Mesa (master): st/mesa: fix incorrect buffer token passed to _mesa_BindFramebuffer()

Brian Paul brianp at kemper.freedesktop.org
Wed Jan 13 15:04:43 UTC 2016


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

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Jan 11 18:22:50 2016 -0700

st/mesa: fix incorrect buffer token passed to _mesa_BindFramebuffer()

I added this code right at the end, and got it wrong.
Only used by the WGL_ARB_render_texture code.

Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
Reviewed-by: Charmaine Lee <charmainel at vmware.com>

---

 src/mesa/state_tracker/st_copytex.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/state_tracker/st_copytex.c b/src/mesa/state_tracker/st_copytex.c
index d246d8b..4e0fd79 100644
--- a/src/mesa/state_tracker/st_copytex.c
+++ b/src/mesa/state_tracker/st_copytex.c
@@ -59,7 +59,7 @@ st_copy_framebuffer_to_texture(GLenum srcBuffer,
    _mesa_GetIntegerv(GL_READ_BUFFER, &readBufSave);
 
    /* Read from the winsys buffer */
-   _mesa_BindFramebuffer(GL_READ_BUFFER, 0);
+   _mesa_BindFramebuffer(GL_READ_FRAMEBUFFER, 0);
    _mesa_ReadBuffer(srcBuffer);
 
    /* copy image from pbuffer to texture */
@@ -136,5 +136,5 @@ st_copy_framebuffer_to_texture(GLenum srcBuffer,
 
    /* restore readbuffer */
    _mesa_ReadBuffer(readBufSave);
-   _mesa_BindFramebuffer(GL_READ_BUFFER, readFBOSave);
+   _mesa_BindFramebuffer(GL_READ_FRAMEBUFFER, readFBOSave);
 }




More information about the mesa-commit mailing list