main: select ES3.2 version when all extensions are available
authorIlia Mirkin <imirkin@alum.mit.edu>
Sun, 24 Apr 2016 17:24:25 +0000 (13:24 -0400)
committerIlia Mirkin <imirkin@alum.mit.edu>
Tue, 26 Apr 2016 03:40:34 +0000 (23:40 -0400)
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Dave Airlie <airlied@redhat.com>
src/mesa/main/version.c

index b9c1bcbbc6ee0b8e929b351b6224fe17b272ef4d..ffb7787ebe61759fa246bdf8614f0dbb01c99f0d 100644 (file)
@@ -529,8 +529,24 @@ compute_version_es2(const struct gl_extensions *extensions,
                          extensions->ARB_texture_multisample &&
                          extensions->ARB_gpu_shader5 &&
                          extensions->EXT_shader_integer_mix);
+   const bool ver_3_2 = (ver_3_1 &&
+                         /*extensions->KHR_blend_equation_advanced*/ false &&
+                         extensions->KHR_texture_compression_astc_ldr &&
+                         extensions->OES_copy_image &&
+                         extensions->ARB_draw_buffers_blend &&
+                         extensions->ARB_draw_elements_base_vertex &&
+                         extensions->OES_geometry_shader &&
+                         /*extensions->OES_primitive_bounding_box*/ false &&
+                         extensions->OES_sample_variables &&
+                         extensions->ARB_tessellation_shader &&
+                         extensions->ARB_texture_border_clamp &&
+                         extensions->OES_texture_buffer &&
+                         extensions->ARB_texture_cube_map_array &&
+                         extensions->ARB_texture_stencil8);
 
-   if (ver_3_1) {
+   if (ver_3_2) {
+      return 32;
+   } else if (ver_3_1) {
       return 31;
    } else if (ver_3_0) {
       return 30;