diff options
| author | Emil Velikov <[email protected]> | 2018-03-15 12:12:58 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2018-03-16 13:48:46 +0000 |
| commit | f7f95310f0ac3a89419c866caf962c17ea1d599d (patch) | |
| tree | edcb1f0c68be2b0436c14fbd2df7b9ece54fb4a1 | |
| parent | 9fa1d822bf0e70ff982aa73fe6ad68d9883b4b0a (diff) | |
tgsi: move tgsi_processor_to_shader_stage() to a header
This way we can utilise it with later patches.
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/nir/tgsi_to_nir.c | 16 | ||||
| -rw-r--r-- | src/gallium/auxiliary/tgsi/tgsi_from_mesa.h | 15 |
2 files changed, 16 insertions, 15 deletions
diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c index f8df4c10137..bbbf101157f 100644 --- a/src/gallium/auxiliary/nir/tgsi_to_nir.c +++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c @@ -34,6 +34,7 @@ #include "tgsi/tgsi_dump.h" #include "tgsi/tgsi_info.h" #include "tgsi/tgsi_scan.h" +#include "tgsi/tgsi_from_mesa.h" #define SWIZ(X, Y, Z, W) (unsigned[4]){ \ TGSI_SWIZZLE_##X, \ @@ -1887,21 +1888,6 @@ ttn_add_output_stores(struct ttn_compile *c) } } -static gl_shader_stage -tgsi_processor_to_shader_stage(unsigned processor) -{ - switch (processor) { - case PIPE_SHADER_FRAGMENT: return MESA_SHADER_FRAGMENT; - case PIPE_SHADER_VERTEX: return MESA_SHADER_VERTEX; - case PIPE_SHADER_GEOMETRY: return MESA_SHADER_GEOMETRY; - case PIPE_SHADER_TESS_CTRL: return MESA_SHADER_TESS_CTRL; - case PIPE_SHADER_TESS_EVAL: return MESA_SHADER_TESS_EVAL; - case PIPE_SHADER_COMPUTE: return MESA_SHADER_COMPUTE; - default: - unreachable("invalid TGSI processor"); - } -} - struct nir_shader * tgsi_to_nir(const void *tgsi_tokens, const nir_shader_compiler_options *options) diff --git a/src/gallium/auxiliary/tgsi/tgsi_from_mesa.h b/src/gallium/auxiliary/tgsi/tgsi_from_mesa.h index bfaa48d7fa3..b4d540baabc 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_from_mesa.h +++ b/src/gallium/auxiliary/tgsi/tgsi_from_mesa.h @@ -68,4 +68,19 @@ pipe_shader_type_from_mesa(gl_shader_stage stage) } } +static inline gl_shader_stage +tgsi_processor_to_shader_stage(unsigned processor) +{ + switch (processor) { + case PIPE_SHADER_FRAGMENT: return MESA_SHADER_FRAGMENT; + case PIPE_SHADER_VERTEX: return MESA_SHADER_VERTEX; + case PIPE_SHADER_GEOMETRY: return MESA_SHADER_GEOMETRY; + case PIPE_SHADER_TESS_CTRL: return MESA_SHADER_TESS_CTRL; + case PIPE_SHADER_TESS_EVAL: return MESA_SHADER_TESS_EVAL; + case PIPE_SHADER_COMPUTE: return MESA_SHADER_COMPUTE; + default: + unreachable("invalid TGSI processor"); + } +} + #endif /* TGSI_FROM_MESA_H */ |