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

mesa: Remove remnants of PROGRAM_VARYING.

Browse Source 
The previous patch removed the producer of things in this file.
Since there aren't any, we can remove it.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Kenneth Graunke
2012-10-14 16:56:42 -07:00
parent eda4a4ae81
commit d0021cb0fb
5 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mesa/main/mtypes.h
View File

@@ -1851,7 +1851,6 @@ typedef enum
PROGRAM_TEMPORARY, /**< machine->Temporary[] */ PROGRAM_TEMPORARY, /**< machine->Temporary[] */
PROGRAM_INPUT, /**< machine->Inputs[] */ PROGRAM_INPUT, /**< machine->Inputs[] */
PROGRAM_OUTPUT, /**< machine->Outputs[] */ PROGRAM_OUTPUT, /**< machine->Outputs[] */
PROGRAM_VARYING, /**< machine->Inputs[]/Outputs[] */
PROGRAM_LOCAL_PARAM, /**< gl_program->LocalParams[] */ PROGRAM_LOCAL_PARAM, /**< gl_program->LocalParams[] */
PROGRAM_ENV_PARAM, /**< gl_program->Parameters[] */ PROGRAM_ENV_PARAM, /**< gl_program->Parameters[] */
PROGRAM_STATE_VAR, /**< gl_program->Parameters[] */ PROGRAM_STATE_VAR, /**< gl_program->Parameters[] */

2
src/mesa/program/prog_parameter_layout.c
View File

@@ -173,7 +173,7 @@ _mesa_layout_parameters(struct asm_parser_state *state)
continue; continue;
} }
if ((inst->SrcReg[i].Base.File <= PROGRAM_VARYING ) if ((inst->SrcReg[i].Base.File <= PROGRAM_OUTPUT)
|| (inst->SrcReg[i].Base.File >= PROGRAM_WRITE_ONLY)) { || (inst->SrcReg[i].Base.File >= PROGRAM_WRITE_ONLY)) {
continue; continue;
} }

5
src/mesa/program/prog_print.c
View File

@@ -64,8 +64,6 @@ _mesa_register_file_name(gl_register_file f)
return "CONST"; return "CONST";
case PROGRAM_UNIFORM: case PROGRAM_UNIFORM:
return "UNIFORM"; return "UNIFORM";
case PROGRAM_VARYING:
return "VARYING";
case PROGRAM_WRITE_ONLY: case PROGRAM_WRITE_ONLY:
return "WRITE_ONLY"; return "WRITE_ONLY";
case PROGRAM_ADDRESS: case PROGRAM_ADDRESS:
@@ -348,9 +346,6 @@ reg_string(gl_register_file f, GLint index, gl_prog_print_mode mode,
case PROGRAM_LOCAL_PARAM: case PROGRAM_LOCAL_PARAM:
sprintf(str, "program.local[%s%d]", addr, index); sprintf(str, "program.local[%s%d]", addr, index);
break; break;
case PROGRAM_VARYING: /* extension */
sprintf(str, "varying[%s%d]", addr, index);
break;
case PROGRAM_CONSTANT: /* extension */ case PROGRAM_CONSTANT: /* extension */
sprintf(str, "constant[%s%d]", addr, index); sprintf(str, "constant[%s%d]", addr, index);
break; break;

7
src/mesa/program/programopt.c
View File

@@ -499,9 +499,7 @@ _mesa_count_texture_instructions(struct gl_program *prog)
/** /**
* Scan/rewrite program to remove reads of custom (output) registers. * Scan/rewrite program to remove reads of custom (output) registers.
* The passed type has to be either PROGRAM_OUTPUT or PROGRAM_VARYING * The passed type has to be PROGRAM_OUTPUT.
* (for vertex shaders).
* In GLSL shaders, varying vars can be read and written.
* On some hardware, trying to read an output register causes trouble. * On some hardware, trying to read an output register causes trouble.
* So, rewrite the program to use a temporary register in this case. * So, rewrite the program to use a temporary register in this case.
*/ */
@@ -517,8 +515,7 @@ _mesa_remove_output_reads(struct gl_program *prog, gl_register_file type)
_mesa_find_used_registers(prog, PROGRAM_TEMPORARY, _mesa_find_used_registers(prog, PROGRAM_TEMPORARY,
usedTemps, MAX_PROGRAM_TEMPS); usedTemps, MAX_PROGRAM_TEMPS);
assert(type == PROGRAM_VARYING || type == PROGRAM_OUTPUT); assert(type == PROGRAM_OUTPUT);
assert(prog->Target == GL_VERTEX_PROGRAM_ARB || type != PROGRAM_VARYING);
for (i = 0; i < VERT_RESULT_MAX; i++) for (i = 0; i < VERT_RESULT_MAX; i++)
outputMap[i] = -1; outputMap[i] = -1;

2
src/mesa/state_tracker/st_program.c
View File

@@ -309,7 +309,6 @@ st_translate_vertex_program(struct st_context *st,
if (!stvp->glsl_to_tgsi) if (!stvp->glsl_to_tgsi)
{ {
_mesa_remove_output_reads(&stvp->Base.Base, PROGRAM_OUTPUT); _mesa_remove_output_reads(&stvp->Base.Base, PROGRAM_OUTPUT);
_mesa_remove_output_reads(&stvp->Base.Base, PROGRAM_VARYING);
} }
ureg = ureg_create( TGSI_PROCESSOR_VERTEX ); ureg = ureg_create( TGSI_PROCESSOR_VERTEX );
@@ -828,7 +827,6 @@ st_translate_geometry_program(struct st_context *st,
return NULL; return NULL;
_mesa_remove_output_reads(&stgp->Base.Base, PROGRAM_OUTPUT); _mesa_remove_output_reads(&stgp->Base.Base, PROGRAM_OUTPUT);
_mesa_remove_output_reads(&stgp->Base.Base, PROGRAM_VARYING);
ureg = ureg_create( TGSI_PROCESSOR_GEOMETRY ); ureg = ureg_create( TGSI_PROCESSOR_GEOMETRY );
if (ureg == NULL) { if (ureg == NULL) {