Mesa (8.0): mesa: Avoid short-circuiting realloc of renderbuffers to new sample count.

[Eric Anholt]

Module: Mesa
Branch: 8.0
Commit: 48e72b660549577c25a444826073f77232072dd9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=48e72b660549577c25a444826073f77232072dd9

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Jan 11 13:46:43 2012 -0800

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

Fixes piglit EXT_framebuffer_multisample/renderbuffer-samples.

Reviewed-by: Brian Paul <brianp at vmware.com>
NOTE: This is a candidate for the 8.0 branch.
(cherry picked from commit 0e8d156c3cd70a67c99a82e42e7875f69b6a5b94)

---

 src/mesa/main/fbobject.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index aefcaf3..e6bab4b 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1395,7 +1395,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;
    }