From: Brian Paul <brianp@vmware.com>
Date: Tue, 12 Jan 2016 01:22:50 +0000 (-0700)
Subject: st/mesa: fix incorrect buffer token passed to _mesa_BindFramebuffer()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=235a2995345f330b1af0ac9d11a22343d5934356;p=mesa.git

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@vmware.com>
Reviewed-by: Charmaine Lee <charmainel@vmware.com>
---

diff --git a/src/mesa/state_tracker/st_copytex.c b/src/mesa/state_tracker/st_copytex.c
index d246d8b6a71..4e0fd790d43 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);
 }