Mesa (master): mesa: require GL_MAX_SAMPLES >= 4 for GL 3.0

Dylan Noblesmith nobled at kemper.freedesktop.org
Sun Apr 29 11:20:25 UTC 2012


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

Author: Dylan Noblesmith <nobled at dreamwidth.org>
Date:   Sat Apr 21 19:35:48 2012 +0000

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 at whitecape.org>

---

 src/mesa/main/version.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index 82cc54b..607230b 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 &&




More information about the mesa-commit mailing list