From: Brian Paul <brianp@vmware.com>
Date: Wed, 10 Mar 2010 17:50:17 +0000 (-0700)
Subject: st/mesa: set strb->format field in st_render_texture()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=06c44e852f4b38db03772adec769854b2f3096f6;p=mesa.git

st/mesa: set strb->format field in st_render_texture()

This fixes a problem in glReadPixels when reading from an FBO's texture
attachment.  We have a better chance at hitting a fast path for
glReadPixels now.
---

diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index 00e9d1dccbd..abf0c8d6cb1 100644
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -379,6 +379,8 @@ st_render_texture(GLcontext *ctx,
                                            PIPE_BUFFER_USAGE_GPU_READ |
                                            PIPE_BUFFER_USAGE_GPU_WRITE);
 
+   strb->format = pt->format;
+
    strb->Base.Format = st_pipe_format_to_mesa_format(pt->format);
    strb->Base.DataType = st_format_datatype(pt->format);