OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium: replace pipe_type enum with tgsi_return_type enum

Browse Source 
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.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
This commit is contained in:
Brian Paul
2014-09-20 08:32:39 -06:00
parent 9ce72ac1fa
commit e7a614c60c
7 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/auxiliary/tgsi/tgsi_build.c
View File

@@ -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;
}

10
src/gallium/auxiliary/tgsi/tgsi_dump.c
View File

@@ -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);
}
}

5
src/gallium/auxiliary/tgsi/tgsi_strings.c
View File

@@ -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;

2
src/gallium/auxiliary/tgsi/tgsi_strings.h
View File

@@ -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];

6
src/gallium/auxiliary/tgsi/tgsi_text.c
View File

@@ -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;

9
src/gallium/include/pipe/p_format.h
View File

@@ -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)
*/

17
src/gallium/include/pipe/p_shader_tokens.h
View File

@@ -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 {