st/mesa: set ctx->Const.MaxSamples = 0, not 1
authorBrian Paul <brianp@vmware.com>
Sat, 26 Jan 2013 17:09:37 +0000 (10:09 -0700)
committerAndreas Boll <andreas.boll.dev@gmail.com>
Wed, 13 Feb 2013 17:46:40 +0000 (18:46 +0100)
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@gmail.com>
(cherry picked from commit d60da27273d2cdb68bc32cae2ca66718dab15f27)

src/mesa/state_tracker/st_extensions.c

index ac11f12..7cac782 100644 (file)
@@ -630,6 +630,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;