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

gallium: rename TGSI tessellation processor types to match pipe shader names

Browse Source 
I forgot to do this when pushing the interface changes.

Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Marek Olšák
2015-05-18 13:52:30 +02:00
parent 92c31bb0dd
commit 0d84b6cf84
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -286,15 +286,15 @@ iter_declaration(
if (decl->Declaration.File == TGSI_FILE_INPUT && if (decl->Declaration.File == TGSI_FILE_INPUT &&
(iter->processor.Processor == TGSI_PROCESSOR_GEOMETRY || (iter->processor.Processor == TGSI_PROCESSOR_GEOMETRY ||
(!patch && (!patch &&
(iter->processor.Processor == TGSI_PROCESSOR_TESSCTRL || (iter->processor.Processor == TGSI_PROCESSOR_TESS_CTRL ||
iter->processor.Processor == TGSI_PROCESSOR_TESSEVAL)))) { iter->processor.Processor == TGSI_PROCESSOR_TESS_EVAL)))) {
TXT("[]"); TXT("[]");
} }
/* all non-patch tess ctrl shader outputs are two dimensional */ /* all non-patch tess ctrl shader outputs are two dimensional */
if (decl->Declaration.File == TGSI_FILE_OUTPUT && if (decl->Declaration.File == TGSI_FILE_OUTPUT &&
!patch && !patch &&
iter->processor.Processor == TGSI_PROCESSOR_TESSCTRL) { iter->processor.Processor == TGSI_PROCESSOR_TESS_CTRL) {
TXT("[]"); TXT("[]");
} }

4
src/gallium/auxiliary/tgsi/tgsi_info.c
View File

@@ -302,9 +302,9 @@ tgsi_get_processor_name( uint processor )
return "fragment shader"; return "fragment shader";
case TGSI_PROCESSOR_GEOMETRY: case TGSI_PROCESSOR_GEOMETRY:
return "geometry shader"; return "geometry shader";
case TGSI_PROCESSOR_TESSCTRL: case TGSI_PROCESSOR_TESS_CTRL:
return "tessellation control shader"; return "tessellation control shader";
case TGSI_PROCESSOR_TESSEVAL: case TGSI_PROCESSOR_TESS_EVAL:
return "tessellation evaluation shader"; return "tessellation evaluation shader";
default: default:
return "unknown shader type!"; return "unknown shader type!";

12
src/gallium/auxiliary/tgsi/tgsi_sanity.c
View File

@@ -415,8 +415,8 @@ iter_declaration(
decl->Semantic.Name == TGSI_SEMANTIC_TESSINNER; decl->Semantic.Name == TGSI_SEMANTIC_TESSINNER;
if (file == TGSI_FILE_INPUT && !patch && ( if (file == TGSI_FILE_INPUT && !patch && (
processor == TGSI_PROCESSOR_GEOMETRY || processor == TGSI_PROCESSOR_GEOMETRY ||
processor == TGSI_PROCESSOR_TESSCTRL || processor == TGSI_PROCESSOR_TESS_CTRL ||
processor == TGSI_PROCESSOR_TESSEVAL)) { processor == TGSI_PROCESSOR_TESS_EVAL)) {
uint vert; uint vert;
for (vert = 0; vert < ctx->implied_array_size; ++vert) { for (vert = 0; vert < ctx->implied_array_size; ++vert) {
scan_register *reg = MALLOC(sizeof(scan_register)); scan_register *reg = MALLOC(sizeof(scan_register));
@@ -424,7 +424,7 @@ iter_declaration(
check_and_declare(ctx, reg); check_and_declare(ctx, reg);
} }
} else if (file == TGSI_FILE_OUTPUT && !patch && } else if (file == TGSI_FILE_OUTPUT && !patch &&
processor == TGSI_PROCESSOR_TESSCTRL) { processor == TGSI_PROCESSOR_TESS_CTRL) {
uint vert; uint vert;
for (vert = 0; vert < ctx->implied_out_array_size; ++vert) { for (vert = 0; vert < ctx->implied_out_array_size; ++vert) {
scan_register *reg = MALLOC(sizeof(scan_register)); scan_register *reg = MALLOC(sizeof(scan_register));
@@ -489,7 +489,7 @@ iter_property(
prop->Property.PropertyName == TGSI_PROPERTY_GS_INPUT_PRIM) { prop->Property.PropertyName == TGSI_PROPERTY_GS_INPUT_PRIM) {
ctx->implied_array_size = u_vertices_per_prim(prop->u[0].Data); ctx->implied_array_size = u_vertices_per_prim(prop->u[0].Data);
} }
if (iter->processor.Processor == TGSI_PROCESSOR_TESSCTRL && if (iter->processor.Processor == TGSI_PROCESSOR_TESS_CTRL &&
prop->Property.PropertyName == TGSI_PROPERTY_TCS_VERTICES_OUT) prop->Property.PropertyName == TGSI_PROPERTY_TCS_VERTICES_OUT)
ctx->implied_out_array_size = prop->u[0].Data; ctx->implied_out_array_size = prop->u[0].Data;
return TRUE; return TRUE;
@@ -499,8 +499,8 @@ static boolean
prolog(struct tgsi_iterate_context *iter) prolog(struct tgsi_iterate_context *iter)
{ {
struct sanity_check_ctx *ctx = (struct sanity_check_ctx *) iter; struct sanity_check_ctx *ctx = (struct sanity_check_ctx *) iter;
if (iter->processor.Processor == TGSI_PROCESSOR_TESSCTRL || if (iter->processor.Processor == TGSI_PROCESSOR_TESS_CTRL ||
iter->processor.Processor == TGSI_PROCESSOR_TESSEVAL) iter->processor.Processor == TGSI_PROCESSOR_TESS_EVAL)
ctx->implied_array_size = 32; ctx->implied_array_size = 32;
return TRUE; return TRUE;
} }

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

@@ -74,8 +74,8 @@ tgsi_scan_shader(const struct tgsi_token *tokens,
assert(procType == TGSI_PROCESSOR_FRAGMENT || assert(procType == TGSI_PROCESSOR_FRAGMENT ||
procType == TGSI_PROCESSOR_VERTEX || procType == TGSI_PROCESSOR_VERTEX ||
procType == TGSI_PROCESSOR_GEOMETRY || procType == TGSI_PROCESSOR_GEOMETRY ||
procType == TGSI_PROCESSOR_TESSCTRL || procType == TGSI_PROCESSOR_TESS_CTRL ||
procType == TGSI_PROCESSOR_TESSEVAL || procType == TGSI_PROCESSOR_TESS_EVAL ||
procType == TGSI_PROCESSOR_COMPUTE); procType == TGSI_PROCESSOR_COMPUTE);
info->processor = procType; info->processor = procType;
@@ -239,8 +239,8 @@ tgsi_scan_shader(const struct tgsi_token *tokens,
if (procType == TGSI_PROCESSOR_VERTEX || if (procType == TGSI_PROCESSOR_VERTEX ||
procType == TGSI_PROCESSOR_GEOMETRY || procType == TGSI_PROCESSOR_GEOMETRY ||
procType == TGSI_PROCESSOR_TESSCTRL || procType == TGSI_PROCESSOR_TESS_CTRL ||
procType == TGSI_PROCESSOR_TESSEVAL) { procType == TGSI_PROCESSOR_TESS_EVAL) {
if (semName == TGSI_SEMANTIC_CLIPDIST) { if (semName == TGSI_SEMANTIC_CLIPDIST) {
info->num_written_clipdistance += info->num_written_clipdistance +=
util_bitcount(fulldecl->Declaration.UsageMask); util_bitcount(fulldecl->Declaration.UsageMask);

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

@@ -43,8 +43,8 @@ struct tgsi_header
#define TGSI_PROCESSOR_FRAGMENT 0 #define TGSI_PROCESSOR_FRAGMENT 0
#define TGSI_PROCESSOR_VERTEX 1 #define TGSI_PROCESSOR_VERTEX 1
#define TGSI_PROCESSOR_GEOMETRY 2 #define TGSI_PROCESSOR_GEOMETRY 2
#define TGSI_PROCESSOR_TESSCTRL 3 #define TGSI_PROCESSOR_TESS_CTRL 3
#define TGSI_PROCESSOR_TESSEVAL 4 #define TGSI_PROCESSOR_TESS_EVAL 4
#define TGSI_PROCESSOR_COMPUTE 5 #define TGSI_PROCESSOR_COMPUTE 5
struct tgsi_processor struct tgsi_processor