diff options
| author | Ilia Mirkin <[email protected]> | 2014-07-19 09:26:09 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2015-05-16 14:48:54 +0200 |
| commit | 398b0b3e36603188ada03f2df5e2c81b3e8b62a2 (patch) | |
| tree | c4ecbbcb10b8ee1e30d60ec14f8bb067c3aba942 | |
| parent | 35c28103b02598bb5f7b4888384b02d31ee371b5 (diff) | |
gallium: add tessellation shader types
v2: Marek: rename shader types
Signed-off-by: Ilia Mirkin <[email protected]>
Reviewed-by: Roland Scheidegger <[email protected]>
Signed-off-by: Marek Olšák <[email protected]>
| -rw-r--r-- | src/gallium/auxiliary/tgsi/tgsi_info.c | 4 | ||||
| -rw-r--r-- | src/gallium/auxiliary/tgsi/tgsi_strings.c | 4 | ||||
| -rw-r--r-- | src/gallium/auxiliary/tgsi/tgsi_strings.h | 2 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_defines.h | 6 | ||||
| -rw-r--r-- | src/gallium/include/pipe/p_shader_tokens.h | 4 |
5 files changed, 15 insertions, 5 deletions
diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.c b/src/gallium/auxiliary/tgsi/tgsi_info.c index 3cab86efbfe..eb447cb6557 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_info.c +++ b/src/gallium/auxiliary/tgsi/tgsi_info.c @@ -302,6 +302,10 @@ tgsi_get_processor_name( uint processor ) return "fragment shader"; case TGSI_PROCESSOR_GEOMETRY: return "geometry shader"; + case TGSI_PROCESSOR_TESSCTRL: + return "tessellation control shader"; + case TGSI_PROCESSOR_TESSEVAL: + return "tessellation evaluation shader"; default: return "unknown shader type!"; } diff --git a/src/gallium/auxiliary/tgsi/tgsi_strings.c b/src/gallium/auxiliary/tgsi/tgsi_strings.c index 9b727cf9a81..e4e5b90d5d9 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_strings.c +++ b/src/gallium/auxiliary/tgsi/tgsi_strings.c @@ -32,11 +32,13 @@ #include "tgsi_strings.h" -const char *tgsi_processor_type_names[4] = +const char *tgsi_processor_type_names[6] = { "FRAG", "VERT", "GEOM", + "TESS_CTRL", + "TESS_EVAL", "COMP" }; diff --git a/src/gallium/auxiliary/tgsi/tgsi_strings.h b/src/gallium/auxiliary/tgsi/tgsi_strings.h index 90014a225b0..71e74372f22 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_strings.h +++ b/src/gallium/auxiliary/tgsi/tgsi_strings.h @@ -38,7 +38,7 @@ extern "C" { #endif -extern const char *tgsi_processor_type_names[4]; +extern const char *tgsi_processor_type_names[6]; extern const char *tgsi_semantic_names[TGSI_SEMANTIC_COUNT]; diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 0eb8a713c95..0938a5f688c 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -404,8 +404,10 @@ enum pipe_flush_flags #define PIPE_SHADER_VERTEX 0 #define PIPE_SHADER_FRAGMENT 1 #define PIPE_SHADER_GEOMETRY 2 -#define PIPE_SHADER_COMPUTE 3 -#define PIPE_SHADER_TYPES 4 +#define PIPE_SHADER_TESS_CTRL 3 +#define PIPE_SHADER_TESS_EVAL 4 +#define PIPE_SHADER_COMPUTE 5 +#define PIPE_SHADER_TYPES 6 /** diff --git a/src/gallium/include/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h index c14bcbca336..776b0d48342 100644 --- a/src/gallium/include/pipe/p_shader_tokens.h +++ b/src/gallium/include/pipe/p_shader_tokens.h @@ -43,7 +43,9 @@ struct tgsi_header #define TGSI_PROCESSOR_FRAGMENT 0 #define TGSI_PROCESSOR_VERTEX 1 #define TGSI_PROCESSOR_GEOMETRY 2 -#define TGSI_PROCESSOR_COMPUTE 3 +#define TGSI_PROCESSOR_TESSCTRL 3 +#define TGSI_PROCESSOR_TESSEVAL 4 +#define TGSI_PROCESSOR_COMPUTE 5 struct tgsi_processor { |