aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/state_tracker
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-07 07:56:56 +0200
committermarha <marha@users.sourceforge.net>2011-06-07 07:56:56 +0200
commit4dc4001b1b78cc236548d9a01365ee4c04ee22a3 (patch)
tree9926bef1a36bfba16e2ef67ea85c916d6ddeaacb /mesalib/src/mesa/state_tracker
parent336e4aab196609a528213e9ecebcb30fce7aa654 (diff)
parent09a5e4f06e54a817ecbb04b3e2bdc28f27fa3e61 (diff)
downloadvcxsrv-4dc4001b1b78cc236548d9a01365ee4c04ee22a3.tar.gz
vcxsrv-4dc4001b1b78cc236548d9a01365ee4c04ee22a3.tar.bz2
vcxsrv-4dc4001b1b78cc236548d9a01365ee4c04ee22a3.zip
Merge remote-tracking branch 'origin/released'
Conflicts: xorg-server/randr/rrcrtc.c
Diffstat (limited to 'mesalib/src/mesa/state_tracker')
-rw-r--r--mesalib/src/mesa/state_tracker/st_cb_fbo.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_fbo.c b/mesalib/src/mesa/state_tracker/st_cb_fbo.c
index 64424f776..5b9e20374 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_fbo.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_fbo.c
@@ -270,7 +270,8 @@ st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw)
strb->Base.InternalFormat = GL_STENCIL_INDEX8_EXT;
break;
case PIPE_FORMAT_R16G16B16A16_SNORM:
- strb->Base.InternalFormat = GL_RGBA16;
+ /* accum buffer */
+ strb->Base.InternalFormat = GL_RGBA16_SNORM;
break;
case PIPE_FORMAT_R8_UNORM:
strb->Base.InternalFormat = GL_R8;