Mesa (master): st/mesa: set ctx->Const.MaxSamples = 0, not 1

[Brian Paul]

Module: Mesa
Branch: master
Commit: d60da27273d2cdb68bc32cae2ca66718dab15f27
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d60da27273d2cdb68bc32cae2ca66718dab15f27

Author: Brian Paul <brianp at vmware.com>
Date:   Sat Jan 26 10:09:37 2013 -0700

st/mesa: set ctx->Const.MaxSamples = 0, not 1

The gallium docs for pipe_screen::is_format_supported() says that
samples==0 or samples==1 both mean that multisampling is not supported.
Return GL_MAX_SAMPLES==0 instead of 1 for consistency with other drivers.

Note: This is a candidate for the 9.0 branch.

Reviewed-by: Marek Olšák <maraeo at gmail.com>

---

 src/mesa/state_tracker/st_extensions.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index af54cf7..f0d8a4c 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -653,6 +653,10 @@ void st_init_extensions(struct st_context *st)
          break;
       }
    }
+   if (ctx->Const.MaxSamples == 1) {
+      /* one sample doesn't really make sense */
+      ctx->Const.MaxSamples = 0;
+   }
 
    if (ctx->Const.MaxDualSourceDrawBuffers > 0)
       ctx->Extensions.ARB_blend_func_extended = GL_TRUE;