mesa: return version 0 if the computed core profile version is too low
authorMarek Olšák <marek.olsak@amd.com>
Sun, 3 Aug 2014 03:35:10 +0000 (05:35 +0200)
committerMarek Olšák <marek.olsak@amd.com>
Mon, 11 Aug 2014 19:53:57 +0000 (21:53 +0200)
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
src/mesa/main/version.c

index 270eca722f09d90cadbd5f1bebbdf9242822bbc0..4dea530cd0f4c26a11e2082a353e730d41d27ff0 100644 (file)
@@ -204,7 +204,7 @@ static GLuint
 compute_version(const struct gl_extensions *extensions,
                 const struct gl_constants *consts, gl_api api)
 {
-   GLuint major, minor;
+   GLuint major, minor, version;
 
    const GLboolean ver_1_3 = (extensions->ARB_texture_border_clamp &&
                               extensions->ARB_texture_cube_map &&
@@ -331,7 +331,12 @@ compute_version(const struct gl_extensions *extensions,
       minor = 2;
    }
 
-   return major * 10 + minor;
+   version = major * 10 + minor;
+
+   if (api == API_OPENGL_CORE && version < 31)
+      return 0;
+
+   return version;
 }
 
 static GLuint