From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 11 May 2016 20:11:00 +0000 (-0700)
Subject: i965: Enable GL_OES_shader_io_blocks
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b7af108d3edd156836824dbad23f97d6acf75dc9;p=mesa.git

i965: Enable GL_OES_shader_io_blocks

Only one dEQP io_blocks test fails.  This test fails for the same reason
as the match_different_member_struct_names test in a previous commit.

dEQP-GLES31.functional.separate_shader.validation.io_blocks.match_different_member_struct_names

v2: Add to release notes.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
---

diff --git a/docs/GL3.txt b/docs/GL3.txt
index 9258fdf611a..9a686fd5f03 100644
--- 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                               started (idr)
+  GL_OES_shader_io_blocks                               DONE (i965/gen8+)
   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 6838e1cdd28..0ae1a72e9ab 100644
--- a/docs/relnotes/11.3.0.html
+++ b/docs/relnotes/11.3.0.html
@@ -67,6 +67,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_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/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index c392674f26c..b49e0607f00 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -393,6 +393,7 @@ intelInitExtensions(struct gl_context *ctx)
       ctx->Extensions.ARB_texture_stencil8 = true;
       ctx->Extensions.ARB_gpu_shader_fp64 = true;
       ctx->Extensions.ARB_vertex_attrib_64bit = true;
+      ctx->Extensions.OES_shader_io_blocks = true;
    }
 
    if (brw->gen >= 9) {