i965: Enable ARB_gpu_shader5 on Gen8+.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/docs/relnotes/10.6.0.html b/docs/relnotes/10.6.0.html
index 48f76f961bc3d3e1101604f58f332d5f803eda1f..dbf1229a80eaaec509de47bf27ca2926faf9cd8d 100644 (file)
--- a/docs/relnotes/10.6.0.html
+++ b/docs/relnotes/10.6.0.html
@@ -55,6 +55,7 @@ Note: some of the new features are only available with certain drivers.
 <li>GL_ARB_clip_control on i965</li>
 <li>GL_ARB_program_interface_query (all drivers)</li>
 <li>GL_ARB_texture_stencil8 on nv50, nvc0, r600, radeonsi, softpipe</li>
+<li>GL_ARB_gpu_shader5 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 48064e1eea4cb9e391ceaa9652985fbf2e08be94..c28c1716222c168f67d6dd525f27ff937f9ef6f2 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -303,6 +303,8 @@ intelInitExtensions(struct gl_context *ctx)
 
    if (brw->gen >= 7) {
       ctx->Extensions.ARB_conservative_depth = true;
+      ctx->Extensions.ARB_gpu_shader5 = true;
+      ctx->Extensions.ARB_shader_atomic_counters = true;
       ctx->Extensions.ARB_texture_view = true;
       if (can_do_pipelined_register_writes(brw)) {
          ctx->Extensions.ARB_transform_feedback2 = true;
@@ -342,12 +344,6 @@ intelInitExtensions(struct gl_context *ctx)
 
    ctx->Extensions.ANGLE_texture_compression_dxt = true;
 
-   if (brw->gen >= 7)
-      ctx->Extensions.ARB_shader_atomic_counters = true;
-
-   if (brw->gen == 7)
-      ctx->Extensions.ARB_gpu_shader5 = true;
-
    ctx->Extensions.OES_texture_float = true;
    ctx->Extensions.OES_texture_float_linear = true;
    ctx->Extensions.OES_texture_half_float = true;