summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2016-06-21 10:56:23 -0700
committerIan Romanick <[email protected]>2016-07-19 12:19:29 -0700
commit4b2b6d4d4d62985679f164eef7d02a552e221941 (patch)
treef649645877993fe25cb5c9c6c0c4daadacd33f85 /src/mesa
parenta2379e44aa7752c2a1fae42c8a8a6e8e2fb84e87 (diff)
i965: Move enable of EXT_shader_integer_mix
This extension does not depend on the Gen. It only depends on the availability of GLSL 1.30. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/intel_extensions.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c b/src/mesa/drivers/dri/i965/intel_extensions.c
index c557137f269..5e2628faffa 100644
--- a/src/mesa/drivers/dri/i965/intel_extensions.c
+++ b/src/mesa/drivers/dri/i965/intel_extensions.c
@@ -276,10 +276,11 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Const.GLSLVersion = 120;
_mesa_override_glsl_version(&ctx->Const);
+ ctx->Extensions.EXT_shader_integer_mix = ctx->Const.GLSLVersion >= 130;
+
if (brw->gen >= 5) {
ctx->Extensions.ARB_texture_query_levels = ctx->Const.GLSLVersion >= 130;
ctx->Extensions.ARB_texture_query_lod = true;
- ctx->Extensions.EXT_shader_integer_mix = ctx->Const.GLSLVersion >= 130;
ctx->Extensions.EXT_timer_query = true;
if (brw->gen == 5 || can_write_oacontrol(brw)) {