summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTapani Pälli <tapani.palli@intel.com>2015-06-29 09:48:52 +0300
committerEmil Velikov <emil.l.velikov@gmail.com>2015-07-01 15:22:40 +0100
commitc11a8c1c33512538433a04295c2c7327c6a85a64 (patch)
tree7f5aa9ec3be323c734b8e1808054c51476d858b9
parent4c80d44311cac8bbf61119c46454f212fb42fb40 (diff)
mesa/st: use EmitNoIndirectSampler if !ARB_gpu_shader5
Signed-off-by: Tapani Pälli <tapani.palli@intel.com> Reviewed-by: Francisco Jerez <currojerez@riseup.net> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Cc: "10.5" and "10.6" <mesa-stable@lists.freedesktop.org> (cherry picked from commit f17c8c287f3581fccb52714fbd4b2ea09a58e3d3)
-rw-r--r--src/mesa/state_tracker/st_context.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 9fd6caece7..a49e321f58 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -276,6 +276,11 @@ st_create_context_priv( struct gl_context *ctx, struct pipe_context *pipe,
/* For vertex shaders, make sure not to emit saturate when SM 3.0 is not supported */
ctx->Const.ShaderCompilerOptions[MESA_SHADER_VERTEX].EmitNoSat = !st->has_shader_model3;
+ if (!ctx->Extensions.ARB_gpu_shader5) {
+ for (i = 0; i < MESA_SHADER_STAGES; i++)
+ ctx->Const.ShaderCompilerOptions[i].EmitNoIndirectSampler = true;
+ }
+
_mesa_compute_version(ctx);
if (ctx->Version == 0) {