I'd prefer TESSCONTROL over TESTCTRL. Other than that, it looks good.
Marek
On Sat, Jul 19, 2014 at 4:59 PM, Ilia Mirkin <imir...@alum.mit.edu> wrote:
> Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu>
> ---
> src/gallium/auxiliary/tgsi/tgsi_info.c | 4 ++++
> src/gallium/auxiliary/tgsi/tgsi_strings.c | 4 +++-
> src/gallium/auxiliary/tgsi/tgsi_strings.h | 2 +-
> src/gallium/include/pipe/p_defines.h | 6 ++++--
> 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 e24348f..3018ded 100644
> --- a/src/gallium/auxiliary/tgsi/tgsi_info.c
> +++ b/src/gallium/auxiliary/tgsi/tgsi_info.c
> @@ -275,6 +275,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 3c108a8..be5534c 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",
> + "TESSC",
> + "TESSE",
> "COMP"
> };
>
> diff --git a/src/gallium/auxiliary/tgsi/tgsi_strings.h
> b/src/gallium/auxiliary/tgsi/tgsi_strings.h
> index 1c37c29..0ebed69 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 d9b6e5a..214640c 100644
> --- a/src/gallium/include/pipe/p_defines.h
> +++ b/src/gallium/include/pipe/p_defines.h
> @@ -398,8 +398,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_TESSCTRL 3
> +#define PIPE_SHADER_TESSEVAL 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 0d3ad6a..01a8128 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
> {
> --
> 1.8.5.5
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
