Reviewed-by: Roland Scheidegger <srol...@vmware.com>
Roland
Am 22.09.2014 21:36, schrieb Brian Paul:
> The only place the enum pipe_type was used is for the TGSI sampler
> view return type. So make it a TGSI type. Note: it appears this
> part of TGSI isn't used by anyone so it may be removed in the future.
>
> v2: the new name is tgsi_return_type, not tgsi_type. This means we
> can drop the previously posted tgsi_type -> tgsi_opcode_type patch.
> ---
> src/gallium/auxiliary/tgsi/tgsi_build.c | 8 ++++----
> src/gallium/auxiliary/tgsi/tgsi_dump.c | 10 +++++-----
> src/gallium/auxiliary/tgsi/tgsi_strings.c | 5 +++--
> src/gallium/auxiliary/tgsi/tgsi_strings.h | 2 +-
> src/gallium/auxiliary/tgsi/tgsi_text.c | 6 +++---
> src/gallium/include/pipe/p_format.h | 9 ---------
> src/gallium/include/pipe/p_shader_tokens.h | 17 +++++++++++++----
> 7 files changed, 29 insertions(+), 28 deletions(-)
>
> diff --git a/src/gallium/auxiliary/tgsi/tgsi_build.c
> b/src/gallium/auxiliary/tgsi/tgsi_build.c
> index bef5c75..39a4296 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_RETURN_TYPE_UNORM;
> + dsv.ReturnTypeY = TGSI_RETURN_TYPE_UNORM;
> + dsv.ReturnTypeZ = TGSI_RETURN_TYPE_UNORM;
> + dsv.ReturnTypeW = TGSI_RETURN_TYPE_UNORM;
>
> return dsv;
> }
> diff --git a/src/gallium/auxiliary/tgsi/tgsi_dump.c
> b/src/gallium/auxiliary/tgsi/tgsi_dump.c
> index 08d3fde..972a37e 100644
> --- a/src/gallium/auxiliary/tgsi/tgsi_dump.c
> +++ b/src/gallium/auxiliary/tgsi/tgsi_dump.c
> @@ -329,15 +329,15 @@ iter_declaration(
> if ((decl->SamplerView.ReturnTypeX == decl->SamplerView.ReturnTypeY) &&
> (decl->SamplerView.ReturnTypeX == decl->SamplerView.ReturnTypeZ) &&
> (decl->SamplerView.ReturnTypeX == decl->SamplerView.ReturnTypeW)) {
> - ENM(decl->SamplerView.ReturnTypeX, tgsi_type_names);
> + ENM(decl->SamplerView.ReturnTypeX, tgsi_return_type_names);
> } else {
> - ENM(decl->SamplerView.ReturnTypeX, tgsi_type_names);
> + ENM(decl->SamplerView.ReturnTypeX, tgsi_return_type_names);
> TXT(", ");
> - ENM(decl->SamplerView.ReturnTypeY, tgsi_type_names);
> + ENM(decl->SamplerView.ReturnTypeY, tgsi_return_type_names);
> TXT(", ");
> - ENM(decl->SamplerView.ReturnTypeZ, tgsi_type_names);
> + ENM(decl->SamplerView.ReturnTypeZ, tgsi_return_type_names);
> TXT(", ");
> - ENM(decl->SamplerView.ReturnTypeW, tgsi_type_names);
> + ENM(decl->SamplerView.ReturnTypeW, tgsi_return_type_names);
> }
> }
>
> diff --git a/src/gallium/auxiliary/tgsi/tgsi_strings.c
> b/src/gallium/auxiliary/tgsi/tgsi_strings.c
> index 3c108a8..f84cd79 100644
> --- a/src/gallium/auxiliary/tgsi/tgsi_strings.c
> +++ b/src/gallium/auxiliary/tgsi/tgsi_strings.c
> @@ -125,7 +125,7 @@ const char *tgsi_property_names[TGSI_PROPERTY_COUNT] =
> "VS_POSITION_WINDOW_SPACE"
> };
>
> -const char *tgsi_type_names[5] =
> +const char *tgsi_return_type_names[TGSI_RETURN_TYPE_COUNT] =
> {
> "UNORM",
> "SNORM",
> @@ -195,8 +195,9 @@ 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_return_type_names) == TGSI_RETURN_TYPE_COUNT);
> (void) tgsi_processor_type_names;
> - (void) tgsi_type_names;
> + (void) tgsi_return_type_names;
> (void) tgsi_immediate_type_names;
> (void) tgsi_fs_coord_origin_names;
> (void) tgsi_fs_coord_pixel_center_names;
> diff --git a/src/gallium/auxiliary/tgsi/tgsi_strings.h
> b/src/gallium/auxiliary/tgsi/tgsi_strings.h
> index 1c37c29..c842746 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_return_type_names[TGSI_RETURN_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 7291145..f965b01 100644
> --- a/src/gallium/auxiliary/tgsi/tgsi_text.c
> +++ b/src/gallium/auxiliary/tgsi/tgsi_text.c
> @@ -1258,8 +1258,8 @@ 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) {
> - if (str_match_nocase_whole(&cur, tgsi_type_names[i])) {
> + for (i = 0; i < TGSI_RETURN_TYPE_COUNT; ++i) {
> + if (str_match_nocase_whole(&cur, tgsi_return_type_names[i])) {
> switch (j) {
> case 0:
> decl.SamplerView.ReturnTypeX = i;
> @@ -1279,7 +1279,7 @@ static boolean parse_declaration( struct translate_ctx
> *ctx )
> break;
> }
> }
> - if (i == PIPE_TYPE_COUNT) {
> + if (i == TGSI_RETURN_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 9c02464..b007229 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 8ab1ea8..df154a2 100644
> --- a/src/gallium/include/pipe/p_shader_tokens.h
> +++ b/src/gallium/include/pipe/p_shader_tokens.h
> @@ -192,12 +192,21 @@ struct tgsi_declaration_resource {
> unsigned Padding : 22;
> };
>
> +enum tgsi_return_type {
> + TGSI_RETURN_TYPE_UNORM = 0,
> + TGSI_RETURN_TYPE_SNORM,
> + TGSI_RETURN_TYPE_SINT,
> + TGSI_RETURN_TYPE_UINT,
> + TGSI_RETURN_TYPE_FLOAT,
> + TGSI_RETURN_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_return_type */
> + unsigned ReturnTypeY : 6; /**< one of enum tgsi_return_type */
> + unsigned ReturnTypeZ : 6; /**< one of enum tgsi_return_type */
> + unsigned ReturnTypeW : 6; /**< one of enum tgsi_return_type */
> };
>
> struct tgsi_declaration_array {
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
