Mesa (master): mesa/st: use EmitNoIndirectSampler if !ARB_gpu_shader5
Tapani Pälli
tpalli at kemper.freedesktop.org
Tue Jun 30 08:31:18 UTC 2015
Module: Mesa
Branch: master
Commit: f17c8c287f3581fccb52714fbd4b2ea09a58e3d3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f17c8c287f3581fccb52714fbd4b2ea09a58e3d3
Author: Tapani Pälli <tapani.palli at intel.com>
Date: Mon Jun 29 09:48:52 2015 +0300
mesa/st: use EmitNoIndirectSampler if !ARB_gpu_shader5
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Cc: "10.5" and "10.6" <mesa-stable at lists.freedesktop.org>
---
src/mesa/state_tracker/st_context.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index ed9ed0f..62a0fbe 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -287,6 +287,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) {
More information about the mesa-commit
mailing list