summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTapani Pälli <tapani.palli@intel.com>2015-06-24 13:22:43 +0300
committerEmil Velikov <emil.l.velikov@gmail.com>2015-07-08 13:33:42 +0100
commitb150817c197a8e0772114641fed3eb19284f4540 (patch)
tree48cc366fdfdefe1837b513a95693ec2dd4c3c347
parent619b9e84bf828e716a7a5b8391fe15efab441828 (diff)
i965: use EmitNoIndirectSampler for gen < 7
Signed-off-by: Tapani Pälli <tapani.palli@intel.com> Reviewed-by: Francisco Jerez <currojerez@riseup.net> Cc: "10.5" and "10.6" <mesa-stable@lists.freedesktop.org> (cherry picked from commit 8852e26e93af1fc4b72bf9d57e847f53e1a1371b) Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Conflicts: src/mesa/drivers/dri/i965/brw_shader.cpp
-rw-r--r--src/mesa/drivers/dri/i965/brw_context.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index a5d682af227..492b62d8935 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -584,6 +584,10 @@ brw_initialize_context_constants(struct brw_context *brw)
(i == MESA_SHADER_FRAGMENT);
ctx->Const.ShaderCompilerOptions[i].EmitNoIndirectUniform = false;
ctx->Const.ShaderCompilerOptions[i].LowerClipDistance = true;
+
+ /* !ARB_gpu_shader5 */
+ if (brw->gen < 7)
+ ctx->Const.ShaderCompilerOptions[i].EmitNoIndirectSampler = true;
}
ctx->Const.ShaderCompilerOptions[MESA_SHADER_VERTEX].OptimizeForAOS = true;