i965: Enable GL_OES_geometry_shader on Gen8+

Gen7 can get this extension (and GL_OES_shader_io_blocks) as soon as the
rest of OpenGL ES 3.1 is enabled.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/docs/features.txt b/docs/features.txt
index 21982c7ccba747111d09710d241003ecf77e2961..fb10ba7e80d4d2dad8eacae357d6bb3528abbfec 100644 (file)
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -260,7 +260,7 @@ GLES3.2, GLSL ES 3.2:
   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                                started (idr)
+  GL_OES_geometry_shader                                DONE (i965/gen8+)
   GL_OES_gpu_shader5                                    DONE (all drivers that support GL_ARB_gpu_shader5)
   GL_OES_primitive_bounding_box                         not started
   GL_OES_sample_shading                                 DONE (i965, nvc0, r600, radeonsi)

diff --git a/docs/relnotes/12.1.0.html b/docs/relnotes/12.1.0.html
index f744864c06d074a6320acb0d534be1b643c84d65..d14906661c818d81fe48893f15024073e8fef02d 100644 (file)
--- a/docs/relnotes/12.1.0.html
+++ b/docs/relnotes/12.1.0.html
@@ -57,6 +57,7 @@ Note: some of the new features are only available with certain drivers.
 <li>GL_ARB_texture_stencil8 on i965/hsw</li>
 <li>OpenGL ES 3.1 on i965/hsw</li>
 <li>GL_KHR_blend_equation_advanced on i965</li>
+<li>GL_OES_geometry_shader on i965/gen8+.</li>
 </ul>
 
 <h2>Bug fixes</h2>

diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index 15009b08ca860212425f39f2f6ccf0a6c0b423cb..c0223a1f8f70f566237d05bd31b0010bb096ac3e 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -398,6 +398,7 @@ intelInitExtensions(struct gl_context *ctx)
       ctx->Extensions.ARB_shader_precision = true;
       ctx->Extensions.ARB_gpu_shader_fp64 = true;
       ctx->Extensions.ARB_vertex_attrib_64bit = true;
+      ctx->Extensions.OES_geometry_shader = true;
       ctx->Extensions.OES_shader_io_blocks = true;
    }