[Mesa-dev] [PATCH 2/2] i965: Enable several GLES 3.1 extensions on HSW+

[Ian Romanick]

From: Ian Romanick <ian.d.romanick at intel.com>

The only reason we didn't previously enable this was the dependency on
OpenGL ES 3.1.  These should have been enabled as soon as HSW got
stencil texturing.  We also needed to fixup setting MaxViewports.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
 docs/features.txt                            | 6 +++---
 docs/relnotes/12.1.0.html                    | 6 +++---
 src/mesa/drivers/dri/i965/intel_extensions.c | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/features.txt b/docs/features.txt
index a677bfb..b1f9384 100644
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -260,18 +260,18 @@ GLES3.2, GLSL ES 3.2 -- all DONE: i965/gen9+
   GL_OES_copy_image                                     DONE (all drivers)
   GL_OES_draw_buffers_indexed                           DONE (all drivers that support GL_ARB_draw_buffers_blend)
   GL_OES_draw_elements_base_vertex                      DONE (all drivers)
-  GL_OES_geometry_shader                                DONE (i965/gen8+, nvc0, radeonsi)
+  GL_OES_geometry_shader                                DONE (i965/hsw+, nvc0, radeonsi)
   GL_OES_gpu_shader5                                    DONE (all drivers that support GL_ARB_gpu_shader5)
   GL_OES_primitive_bounding_box                         DONE (i965/gen7+, nvc0, radeonsi)
   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+, nvc0, radeonsi)
+  GL_OES_shader_io_blocks                               DONE (All drivers that support GLES 3.1)
   GL_OES_shader_multisample_interpolation               DONE (i965, nvc0, r600, radeonsi)
   GL_OES_tessellation_shader                            DONE (all drivers that support GL_ARB_tessellation_shader)
   GL_OES_texture_border_clamp                           DONE (all drivers)
   GL_OES_texture_buffer                                 DONE (i965, nvc0, radeonsi)
-  GL_OES_texture_cube_map_array                         DONE (i965/gen8+, nvc0, radeonsi)
+  GL_OES_texture_cube_map_array                         DONE (i965/hsw+, nvc0, radeonsi)
   GL_OES_texture_stencil8                               DONE (all drivers that support GL_ARB_texture_stencil8)
   GL_OES_texture_storage_multisample_2d_array           DONE (all drivers that support GL_ARB_texture_multisample)
 
diff --git a/docs/relnotes/12.1.0.html b/docs/relnotes/12.1.0.html
index c7e4d01..b8862d3 100644
--- a/docs/relnotes/12.1.0.html
+++ b/docs/relnotes/12.1.0.html
@@ -64,11 +64,11 @@ Note: some of the new features are only available with certain drivers.
 <li>GL_KHR_robustness on nvc0, radeonsi</li>
 <li>GL_KHR_texture_compression_astc_sliced_3d on i965</li>
 <li>GL_OES_copy_image on nv50, nvc0, r600, radeonsi, softpipe, llvmpipe</li>
-<li>GL_OES_geometry_shader on i965/gen8+, nvc0, radeonsi</li>
+<li>GL_OES_geometry_shader on i965/hsw+, nvc0, radeonsi</li>
 <li>GL_OES_primitive_bounding_box on i965/gen7+, nvc0, radeonsi</li>
-<li>GL_OES_texture_cube_map_array on i965/gen8+, nvc0, radeonsi</li>
+<li>GL_OES_texture_cube_map_array on i965/hsw+, nvc0, radeonsi</li>
 <li>GL_OES_tessellation_shader on i965/gen7+, nvc0, radeonsi</li>
-<li>GL_OES_viewport_array on nvc0, radeonsi</li>
+<li>GL_OES_viewport_array on i965/hsw+, nvc0, radeonsi</li>
 <li>GL_ANDROID_extension_pack_es31a on i965/gen9+</li>
 </ul>
 
diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index 66079b5..cbde3fe 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -380,6 +380,9 @@ intelInitExtensions(struct gl_context *ctx)
    if (brw->gen >= 8 || brw->is_haswell) {
       ctx->Extensions.ARB_stencil_texturing = true;
       ctx->Extensions.ARB_texture_stencil8 = true;
+      ctx->Extensions.OES_geometry_shader = true;
+      ctx->Extensions.OES_texture_cube_map_array = true;
+      ctx->Extensions.OES_viewport_array = true;
    }
 
    if (brw->gen >= 8 || brw->is_haswell || brw->is_baytrail) {
@@ -403,9 +406,6 @@ intelInitExtensions(struct gl_context *ctx)
       ctx->Extensions.ARB_shader_precision = true;
       ctx->Extensions.ARB_vertex_attrib_64bit = true;
       ctx->Extensions.ARB_ES3_2_compatibility = true;
-      ctx->Extensions.OES_geometry_shader = true;
-      ctx->Extensions.OES_texture_cube_map_array = true;
-      ctx->Extensions.OES_viewport_array = true;
    }
 
    if (brw->gen >= 9) {
-- 
2.5.5