From: Dylan Noblesmith <nobled@dreamwidth.org>
Date: Sat, 21 Apr 2012 19:35:48 +0000 (+0000)
Subject: mesa: require GL_MAX_SAMPLES >= 4 for GL 3.0
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8e90913e9f99ff3296a3c3da36e73cd2d4730269;p=mesa.git

mesa: require GL_MAX_SAMPLES >= 4 for GL 3.0

As noted in commit be4e46b21a60cfdc826bf89d1078df54966115b1,
this was missing before.

NOTE: This is a candidate for the 8.0 branch.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index 82cc54b44c4..607230b5e3e 100644
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -124,6 +124,7 @@ compute_version(struct gl_context *ctx)
                               ctx->Extensions.EXT_texture_sRGB);
    const GLboolean ver_3_0 = (ver_2_1 &&
                               ctx->Const.GLSLVersion >= 130 &&
+                              ctx->Const.MaxSamples >= 4 &&
                               ctx->Extensions.ARB_color_buffer_float &&
                               ctx->Extensions.ARB_depth_buffer_float &&
                               ctx->Extensions.ARB_half_float_pixel &&