summaryrefslogtreecommitdiffstats
path: root/src/mesa/state_tracker
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2018-03-15 12:51:03 +0000
committerEmil Velikov <[email protected]>2018-03-16 13:49:16 +0000
commit3a9fb4f7ad6de14b5560b85d5f1c723d0555a49b (patch)
tree884a43f1fa749a052a3663f138e82fce8ae84e5e /src/mesa/state_tracker
parentf7f95310f0ac3a89419c866caf962c17ea1d599d (diff)
st/mesa: simplify st_init_limits() via tgsi_processor_to_shader_stage
Reuse the tgis helper and remove a bunch of duplicated code. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker')
-rw-r--r--src/mesa/state_tracker/st_extensions.c45
1 files changed, 6 insertions, 39 deletions
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 3b8e226e673..bea61f21cbb 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -36,6 +36,7 @@
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
#include "pipe/p_screen.h"
+#include "tgsi/tgsi_from_mesa.h"
#include "util/u_math.h"
#include "st_context.h"
@@ -166,52 +167,18 @@ void st_init_limits(struct pipe_screen *screen,
screen->get_compiler_options(screen, PIPE_SHADER_IR_NIR, sh);
}
- switch (sh) {
- case PIPE_SHADER_FRAGMENT:
- pc = &c->Program[MESA_SHADER_FRAGMENT];
- options = &c->ShaderCompilerOptions[MESA_SHADER_FRAGMENT];
- c->ShaderCompilerOptions[MESA_SHADER_FRAGMENT].NirOptions =
- nir_options;
- break;
- case PIPE_SHADER_VERTEX:
- pc = &c->Program[MESA_SHADER_VERTEX];
- options = &c->ShaderCompilerOptions[MESA_SHADER_VERTEX];
- c->ShaderCompilerOptions[MESA_SHADER_VERTEX].NirOptions =
- nir_options;
- break;
- case PIPE_SHADER_GEOMETRY:
- pc = &c->Program[MESA_SHADER_GEOMETRY];
- options = &c->ShaderCompilerOptions[MESA_SHADER_GEOMETRY];
- c->ShaderCompilerOptions[MESA_SHADER_GEOMETRY].NirOptions =
- nir_options;
- break;
- case PIPE_SHADER_TESS_CTRL:
- pc = &c->Program[MESA_SHADER_TESS_CTRL];
- options = &c->ShaderCompilerOptions[MESA_SHADER_TESS_CTRL];
- c->ShaderCompilerOptions[MESA_SHADER_TESS_CTRL].NirOptions =
- nir_options;
- break;
- case PIPE_SHADER_TESS_EVAL:
- pc = &c->Program[MESA_SHADER_TESS_EVAL];
- options = &c->ShaderCompilerOptions[MESA_SHADER_TESS_EVAL];
- c->ShaderCompilerOptions[MESA_SHADER_TESS_EVAL].NirOptions =
- nir_options;
- break;
- case PIPE_SHADER_COMPUTE:
- pc = &c->Program[MESA_SHADER_COMPUTE];
- options = &c->ShaderCompilerOptions[MESA_SHADER_COMPUTE];
- c->ShaderCompilerOptions[MESA_SHADER_COMPUTE].NirOptions =
- nir_options;
+ const gl_shader_stage stage = tgsi_processor_to_shader_stage(sh);
+ pc = &c->Program[stage];
+ options = &c->ShaderCompilerOptions[stage];
+ c->ShaderCompilerOptions[stage].NirOptions = nir_options;
+ if (sh == PIPE_SHADER_COMPUTE) {
if (!screen->get_param(screen, PIPE_CAP_COMPUTE))
continue;
supported_irs =
screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_SUPPORTED_IRS);
if (!(supported_irs & (1 << PIPE_SHADER_IR_TGSI)))
continue;
- break;
- default:
- assert(0);
}
pc->MaxTextureImageUnits =