diff options
| author | Brian Paul <brianp@vmware.com> | 2014-09-20 08:32:39 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2014-09-22 16:56:24 -0600 |
| commit | e7a614c60c21a961d88f8cfd78969052fa7a2685 (patch) | |
| tree | 0f5d45d3696562cf6dcf1e43375805a454141ee7 /src/gallium/auxiliary/tgsi/tgsi_text.c | |
| parent | 9ce72ac1fa13e7e0cec3348816b70602a0982c55 (diff) | |
gallium: replace pipe_type enum with tgsi_return_type enum
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>
Diffstat (limited to 'src/gallium/auxiliary/tgsi/tgsi_text.c')
| -rw-r--r-- | src/gallium/auxiliary/tgsi/tgsi_text.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/tgsi/tgsi_text.c b/src/gallium/auxiliary/tgsi/tgsi_text.c index 729114594c8..f965b0130e0 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; |