The only place the enum pipe_type was used is for the TGSI sampler
view return type. So make it a TGSI type.
---
src/gallium/auxiliary/tgsi/tgsi_build.c | 8 ++++----
src/gallium/auxiliary/tgsi/tgsi_strings.c | 3 ++-
src/gallium/auxiliary/tgsi/tgsi_strings.h | 2 +-
src/gallium/auxiliary/tgsi/tgsi_text.c | 4 ++--
src/gallium/include/pipe/p_format.h | 9 ---------
src/gallium/include/pipe/p_shader_tokens.h | 17 +++++++++++++----
6 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/src/gallium/auxiliary/tgsi/tgsi_build.c
b/src/gallium/auxiliary/tgsi/tgsi_build.c
index 7621b6a..1e1ae18 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_build.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_build.c
@@ -297,10 +297,10 @@ tgsi_default_declaration_sampler_view(void)
struct tgsi_declaration_sampler_view dsv;
dsv.Resource = TGSI_TEXTURE_BUFFER;
- dsv.ReturnTypeX = PIPE_TYPE_UNORM;
- dsv.ReturnTypeY = PIPE_TYPE_UNORM;
- dsv.ReturnTypeZ = PIPE_TYPE_UNORM;
- dsv.ReturnTypeW = PIPE_TYPE_UNORM;
+ dsv.ReturnTypeX = TGSI_TYPE_UNORM;
+ dsv.ReturnTypeY = TGSI_TYPE_UNORM;
+ dsv.ReturnTypeZ = TGSI_TYPE_UNORM;
+ dsv.ReturnTypeW = TGSI_TYPE_UNORM;
return dsv;
}
diff --git a/src/gallium/auxiliary/tgsi/tgsi_strings.c
b/src/gallium/auxiliary/tgsi/tgsi_strings.c
index 5b6e47f..e381bda 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_strings.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_strings.c
@@ -123,7 +123,7 @@ const char *tgsi_property_names[TGSI_PROPERTY_COUNT] =
"VS_PROHIBIT_UCPS"
};
-const char *tgsi_type_names[5] =
+const char *tgsi_type_names[TGSI_TYPE_COUNT] =
{
"UNORM",
"SNORM",
@@ -186,6 +186,7 @@ tgsi_strings_check(void)
STATIC_ASSERT(Elements(tgsi_property_names) == TGSI_PROPERTY_COUNT);
STATIC_ASSERT(Elements(tgsi_primitive_names) == PIPE_PRIM_MAX);
STATIC_ASSERT(Elements(tgsi_interpolate_names) == TGSI_INTERPOLATE_COUNT);
+ STATIC_ASSERT(Elements(tgsi_type_names) == TGSI_TYPE_COUNT);
(void) tgsi_processor_type_names;
(void) tgsi_type_names;
(void) tgsi_immediate_type_names;
diff --git a/src/gallium/auxiliary/tgsi/tgsi_strings.h
b/src/gallium/auxiliary/tgsi/tgsi_strings.h
index 3477d50..8214a61 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_strings.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_strings.h
@@ -46,7 +46,7 @@ extern const char *tgsi_texture_names[TGSI_TEXTURE_COUNT];
extern const char *tgsi_property_names[TGSI_PROPERTY_COUNT];
-extern const char *tgsi_type_names[5];
+extern const char *tgsi_type_names[TGSI_TYPE_COUNT];
extern const char *tgsi_interpolate_names[TGSI_INTERPOLATE_COUNT];
diff --git a/src/gallium/auxiliary/tgsi/tgsi_text.c
b/src/gallium/auxiliary/tgsi/tgsi_text.c
index 2b2e7d5..6fbf70c 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_text.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_text.c
@@ -1209,7 +1209,7 @@ static boolean parse_declaration( struct translate_ctx
*ctx )
++cur;
eat_opt_white( &cur );
for (j = 0; j < 4; ++j) {
- for (i = 0; i < PIPE_TYPE_COUNT; ++i) {
+ for (i = 0; i < TGSI_TYPE_COUNT; ++i) {
if (str_match_nocase_whole(&cur, tgsi_type_names[i])) {
switch (j) {
case 0:
@@ -1230,7 +1230,7 @@ static boolean parse_declaration( struct translate_ctx
*ctx )
break;
}
}
- if (i == PIPE_TYPE_COUNT) {
+ if (i == TGSI_TYPE_COUNT) {
if (j == 0 || j > 2) {
report_error(ctx, "Expected type name");
return FALSE;
diff --git a/src/gallium/include/pipe/p_format.h
b/src/gallium/include/pipe/p_format.h
index a7fdcd0..b438134 100644
--- a/src/gallium/include/pipe/p_format.h
+++ b/src/gallium/include/pipe/p_format.h
@@ -35,15 +35,6 @@ extern "C" {
#include "p_config.h"
-enum pipe_type {
- PIPE_TYPE_UNORM = 0,
- PIPE_TYPE_SNORM,
- PIPE_TYPE_SINT,
- PIPE_TYPE_UINT,
- PIPE_TYPE_FLOAT,
- PIPE_TYPE_COUNT
-};
-
/**
* Texture/surface image formats (preliminary)
*/
diff --git a/src/gallium/include/pipe/p_shader_tokens.h
b/src/gallium/include/pipe/p_shader_tokens.h
index d095bd3..bd71bce 100644
--- a/src/gallium/include/pipe/p_shader_tokens.h
+++ b/src/gallium/include/pipe/p_shader_tokens.h
@@ -187,12 +187,21 @@ struct tgsi_declaration_resource {
unsigned Padding : 22;
};
+enum tgsi_type {
+ TGSI_TYPE_UNORM = 0,
+ TGSI_TYPE_SNORM,
+ TGSI_TYPE_SINT,
+ TGSI_TYPE_UINT,
+ TGSI_TYPE_FLOAT,
+ TGSI_TYPE_COUNT
+};
+
struct tgsi_declaration_sampler_view {
unsigned Resource : 8; /**< one of TGSI_TEXTURE_ */
- unsigned ReturnTypeX : 6; /**< one of enum pipe_type */
- unsigned ReturnTypeY : 6; /**< one of enum pipe_type */
- unsigned ReturnTypeZ : 6; /**< one of enum pipe_type */
- unsigned ReturnTypeW : 6; /**< one of enum pipe_type */
+ unsigned ReturnTypeX : 6; /**< one of enum tgsi_type */
+ unsigned ReturnTypeY : 6; /**< one of enum tgsi_type */
+ unsigned ReturnTypeZ : 6; /**< one of enum tgsi_type */
+ unsigned ReturnTypeW : 6; /**< one of enum tgsi_type */
};
struct tgsi_declaration_array {
--
1.7.10.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
