st/mesa: expose OES_shader_io_blocks when we have enough for ES 3.1

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Matt Turner <mattst88@gmail.com>

diff --git a/docs/GL3.txt b/docs/GL3.txt
index 9a686fd5f03653db92a8200c4a4bbbca599e8bf4..02908d0b27a6cede1bb78e5f452a05f5e651c9db 100644 (file)
--- a/docs/GL3.txt
+++ b/docs/GL3.txt
@@ -264,7 +264,7 @@ GLES3.2, GLSL ES 3.2
   GL_OES_sample_shading                                 DONE (i965, nvc0, r600, radeonsi)
   GL_OES_sample_variables                               DONE (i965, nvc0, r600, radeonsi)
   GL_OES_shader_image_atomic                            DONE (all drivers that support GL_ARB_shader_image_load_store)
-  GL_OES_shader_io_blocks                               DONE (i965/gen8+)
+  GL_OES_shader_io_blocks                               DONE (i965/gen8+, nvc0, radeonsi)
   GL_OES_shader_multisample_interpolation               DONE (i965, nvc0, r600, radeonsi)
   GL_OES_tessellation_shader                            started (Ken)
   GL_OES_texture_border_clamp                           DONE (all drivers)

diff --git a/docs/relnotes/11.3.0.html b/docs/relnotes/11.3.0.html
index e16ef7d7c4a04d7138b6333e7fbf7e8f47e17ef1..c4736d3670d6bf047e9f3e5a0ff029ee87c7a9a8 100644 (file)
--- a/docs/relnotes/11.3.0.html
+++ b/docs/relnotes/11.3.0.html
@@ -69,7 +69,7 @@ Note: some of the new features are only available with certain drivers.
 <li>GL_OES_sample_shading on i965, nvc0, r600, radeonsi</li>
 <li>GL_OES_sample_variables on i965, nvc0, r600, radeonsi</li>
 <li>GL_OES_shader_image_atomic on all drivers that support GL_ARB_shader_image_load_store</li>
-<li>GL_OES_shader_io_blocks on all i965</li>
+<li>GL_OES_shader_io_blocks on i965, nvc0, radeonsi</li>
 <li>GL_OES_shader_multisample_interpolation on i965, nvc0, r600, radeonsi</li>
 <li>GL_OES_texture_border_clamp and GL_EXT_texture_border_clamp on all drivers that support GL_ARB_texture_border_clamp</li>
 <li>GL_OES_texture_buffer and GL_EXT_texture_buffer on i965, nvc0, radeonsi</li>

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 68e66018feb5784d1578e988d5ddbf068d60c4a6..d35e19f3f900634840c703896a32ebba59384b6c 100644 (file)
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -1203,4 +1203,10 @@ void st_init_extensions(struct pipe_screen *screen,
       extensions->ARB_texture_multisample &&
       extensions->ARB_gpu_shader5 &&
       extensions->EXT_shader_integer_mix;
+
+   /* And if we have enough for ES 3.1, we can also expose
+    * OES_shader_io_blocks, which is only hidden due to the compiler not being
+    * able to version-restrict things.
+    */
+   extensions->OES_shader_io_blocks = extensions->ARB_ES3_1_compatibility;
 }