diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2012-10-14 16:56:42 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2012-10-16 11:35:24 -0700 |
| commit | d0021cb0fb7c28ff9f496f02b7bb3b2ab0722304 (patch) | |
| tree | 06ac2bff482e1fca69e4a9d5ed54cf5b9caa70c4 /src/mesa/program | |
| parent | eda4a4ae81481c4b0a300ad91e607a18a8d81cb3 (diff) | |
| download | external_mesa3d-d0021cb0fb7c28ff9f496f02b7bb3b2ab0722304.zip external_mesa3d-d0021cb0fb7c28ff9f496f02b7bb3b2ab0722304.tar.gz external_mesa3d-d0021cb0fb7c28ff9f496f02b7bb3b2ab0722304.tar.bz2 | |
mesa: Remove remnants of PROGRAM_VARYING.
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>
Diffstat (limited to 'src/mesa/program')
| -rw-r--r-- | src/mesa/program/prog_parameter_layout.c | 2 | ||||
| -rw-r--r-- | src/mesa/program/prog_print.c | 5 | ||||
| -rw-r--r-- | src/mesa/program/programopt.c | 7 |
3 files changed, 3 insertions, 11 deletions
diff --git a/src/mesa/program/prog_parameter_layout.c b/src/mesa/program/prog_parameter_layout.c index e4f2db3..e834690 100644 --- a/src/mesa/program/prog_parameter_layout.c +++ b/src/mesa/program/prog_parameter_layout.c @@ -173,7 +173,7 @@ _mesa_layout_parameters(struct asm_parser_state *state) 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)) { continue; } diff --git a/src/mesa/program/prog_print.c b/src/mesa/program/prog_print.c index bb506ea..5fadb82 100644 --- a/src/mesa/program/prog_print.c +++ b/src/mesa/program/prog_print.c @@ -64,8 +64,6 @@ _mesa_register_file_name(gl_register_file f) return "CONST"; case PROGRAM_UNIFORM: return "UNIFORM"; - case PROGRAM_VARYING: - return "VARYING"; case PROGRAM_WRITE_ONLY: return "WRITE_ONLY"; case PROGRAM_ADDRESS: @@ -348,9 +346,6 @@ reg_string(gl_register_file f, GLint index, gl_prog_print_mode mode, case PROGRAM_LOCAL_PARAM: sprintf(str, "program.local[%s%d]", addr, index); break; - case PROGRAM_VARYING: /* extension */ - sprintf(str, "varying[%s%d]", addr, index); - break; case PROGRAM_CONSTANT: /* extension */ sprintf(str, "constant[%s%d]", addr, index); break; diff --git a/src/mesa/program/programopt.c b/src/mesa/program/programopt.c index 389ea21..2a37021 100644 --- a/src/mesa/program/programopt.c +++ b/src/mesa/program/programopt.c @@ -499,9 +499,7 @@ _mesa_count_texture_instructions(struct gl_program *prog) /** * Scan/rewrite program to remove reads of custom (output) registers. - * The passed type has to be either PROGRAM_OUTPUT or PROGRAM_VARYING - * (for vertex shaders). - * In GLSL shaders, varying vars can be read and written. + * The passed type has to be PROGRAM_OUTPUT. * On some hardware, trying to read an output register causes trouble. * 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, usedTemps, MAX_PROGRAM_TEMPS); - assert(type == PROGRAM_VARYING || type == PROGRAM_OUTPUT); - assert(prog->Target == GL_VERTEX_PROGRAM_ARB || type != PROGRAM_VARYING); + assert(type == PROGRAM_OUTPUT); for (i = 0; i < VERT_RESULT_MAX; i++) outputMap[i] = -1; |