summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2018-05-31 15:20:48 -0400
committerMarek Olšák <[email protected]>2018-06-01 01:04:17 -0400
commit9e61147ef6de379700b2fec3c9cea30cc2eb23d9 (patch)
tree991d2644b40946bede25698f1937266fb492997b
parent29a139b308d51560e0f1d5862fa228023c9a5a04 (diff)
st/mesa: relax requirements for ARB_ES3_compatibility
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106748 Reviewed-by: Timothy Arceri <[email protected]>
-rw-r--r--src/mesa/state_tracker/st_extensions.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index bf73d506c17..467d9b07596 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -1204,11 +1204,14 @@ void st_init_extensions(struct pipe_screen *screen,
extensions->ARB_framebuffer_no_attachments = GL_TRUE;
/* GL_ARB_ES3_compatibility.
- *
- * Assume that ES3 is supported if GLSL 3.30 is supported.
- * (OpenGL 3.3 is a requirement for that extension.)
+ * Check requirements for GLSL ES 3.00.
*/
- if (GLSLVersion >= 330 &&
+ if (GLSLVersion >= 130 &&
+ extensions->ARB_uniform_buffer_object &&
+ extensions->ARB_shader_bit_encoding &&
+ extensions->NV_primitive_restart &&
+ screen->get_shader_param(screen, PIPE_SHADER_VERTEX,
+ PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS) >= 16 &&
/* Requirements for ETC2 emulation. */
screen->is_format_supported(screen, PIPE_FORMAT_R8G8B8A8_UNORM,
PIPE_TEXTURE_2D, 0,