Mesa (master): gallium: add tessellation shader types
Marek Olšák
mareko at kemper.freedesktop.org
Sat May 16 13:17:59 UTC 2015
Module: Mesa
Branch: master
Commit: 398b0b3e36603188ada03f2df5e2c81b3e8b62a2
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=398b0b3e36603188ada03f2df5e2c81b3e8b62a2
Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date: Sat Jul 19 09:26:09 2014 -0400
gallium: add tessellation shader types
v2: Marek: rename shader types
Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
Signed-off-by: Marek Olšák <marek.olsak at amd.com>
---
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 3cab86e..eb447cb 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 9b727cf..e4e5b90 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 90014a2..71e7437 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 0eb8a71..0938a5f 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 c14bcbc..776b0d4 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
{
More information about the mesa-commit
mailing list