From 41437f1b770101647d009529dd1f7b61c29a1ba8 Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gmail.com>
Date: Thu, 22 Jun 2017 12:24:08 -0700
Subject: [PATCH] i965: Enable ARB_shader_group_vote

---
 docs/features.txt                            | 2 +-
 docs/relnotes/17.2.0.html                    | 1 +
 src/mesa/drivers/dri/i965/intel_extensions.c | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/features.txt b/docs/features.txt
index 79b71de5438..ec78447e888 100644
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -295,7 +295,7 @@ Khronos, ARB, and OES extensions that are not part of any OpenGL or OpenGL ES ve
   GL_ARB_shader_ballot                                  DONE (nvc0, radeonsi)
   GL_ARB_shader_clock                                   DONE (i965/gen7+, nv50, nvc0, radeonsi)
   GL_ARB_shader_draw_parameters                         DONE (i965, nvc0, radeonsi)
-  GL_ARB_shader_group_vote                              DONE (nvc0, radeonsi)
+  GL_ARB_shader_group_vote                              DONE (i965, nvc0, radeonsi)
   GL_ARB_shader_stencil_export                          DONE (i965/gen9+, radeonsi, softpipe, llvmpipe, swr)
   GL_ARB_shader_viewport_layer_array                    DONE (i965/gen6+, nvc0, radeonsi)
   GL_ARB_sparse_buffer                                  DONE (radeonsi/CIK+)
diff --git a/docs/relnotes/17.2.0.html b/docs/relnotes/17.2.0.html
index 5859274d127..c1e79ab6cb5 100644
--- a/docs/relnotes/17.2.0.html
+++ b/docs/relnotes/17.2.0.html
@@ -46,6 +46,7 @@ Note: some of the new features are only available with certain drivers.
 <ul>
 <li>GL_ARB_bindless_texture on radeonsi</li>
 <li>GL_ARB_post_depth_coverage on nvc0 (GM200+)</li>
+<li>GL_ARB_shader_group_vote on i965 (with a no-op vec4 implementation)</li>
 <li>GL_ARB_shader_viewport_layer_array on nvc0 (GM200+)</li>
 <li>GL_AMD_vertex_shader_layer on nvc0 (GM200+)</li>
 <li>GL_AMD_vertex_shader_viewport_index on nvc0 (GM200+)</li>
diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index 7921b12c16a..3270e655eec 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -69,6 +69,7 @@ intelInitExtensions(struct gl_context *ctx)
    ctx->Extensions.ARB_seamless_cube_map = true;
    ctx->Extensions.ARB_shader_bit_encoding = true;
    ctx->Extensions.ARB_shader_draw_parameters = true;
+   ctx->Extensions.ARB_shader_group_vote = true;
    ctx->Extensions.ARB_shader_texture_lod = true;
    ctx->Extensions.ARB_shading_language_packing = true;
    ctx->Extensions.ARB_shadow = true;
-- 
2.30.2