summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Mirkin <imirkin@alum.mit.edu>2016-04-24 13:24:25 -0400
committerIlia Mirkin <imirkin@alum.mit.edu>2016-04-25 23:40:34 -0400
commitfa8c0ccfbcc140d8c88a48a8c7c7acc8b8b7e363 (patch)
tree483435b737d24772312c8f0bdb6a3f62a160a689
parente3e6859381df15fe17a4bd2b93906f69a3657dd4 (diff)
main: select ES3.2 version when all extensions are available
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Reviewed-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--src/mesa/main/version.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index b9c1bcbbc6e..ffb7787ebe6 100644
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -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;