From: Eric Anholt <eric@anholt.net>
Date: Wed, 11 Jan 2012 21:46:43 +0000 (-0800)
Subject: mesa: Avoid short-circuiting realloc of renderbuffers to new sample count.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0e8d156c3cd70a67c99a82e42e7875f69b6a5b94;p=mesa.git

mesa: Avoid short-circuiting realloc of renderbuffers to new sample count.

Fixes piglit EXT_framebuffer_multisample/renderbuffer-samples.

Reviewed-by: Brian Paul <brianp@vmware.com>
NOTE: This is a candidate for the 8.0 branch.
---

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index de94da6df07..0524959075f 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1375,7 +1375,8 @@ renderbuffer_storage(GLenum target, GLenum internalFormat,
 
    if (rb->InternalFormat == internalFormat &&
        rb->Width == (GLuint) width &&
-       rb->Height == (GLuint) height) {
+       rb->Height == (GLuint) height &&
+       rb->NumSamples == samples) {
       /* no change in allocation needed */
       return;
    }