From: Ian Romanick Date: Tue, 21 Jun 2016 17:56:23 +0000 (-0700) Subject: i965: Move enable of EXT_shader_integer_mix X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4b2b6d4d4d62985679f164eef7d02a552e221941;p=mesa.git 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 Reviewed-by: Matt Turner --- 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)) {