summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2015-04-24 11:28:06 -0700
committerMatt Turner <mattst88@gmail.com>2015-04-27 14:44:32 -0700
commitff6ee39c19adc59225d1f0664695c669cd7e5a94 (patch)
tree59ac42ef0bb72b13ae82ffd2311bb5e0853da290
parent0c06d019bcf626b289ae94ca791dc25c216c1e5c (diff)
downloadexternal_mesa3d-ff6ee39c19adc59225d1f0664695c669cd7e5a94.zip
external_mesa3d-ff6ee39c19adc59225d1f0664695c669cd7e5a94.tar.gz
external_mesa3d-ff6ee39c19adc59225d1f0664695c669cd7e5a94.tar.bz2
i965: Enable ARB_gpu_shader5 on Gen8+.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-rw-r--r--docs/relnotes/10.6.0.html1
-rw-r--r--src/mesa/drivers/dri/i965/intel_extensions.c8
2 files changed, 3 insertions, 6 deletions
diff --git a/docs/relnotes/10.6.0.html b/docs/relnotes/10.6.0.html
index 48f76f9..dbf1229 100644
--- 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 48064e1..c28c171 100644
--- 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;