summaryrefslogtreecommitdiffstats
path: root/src/mesa/program/programopt.c
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2012-10-14 16:56:42 -0700
committerKenneth Graunke <kenneth@whitecape.org>2012-10-16 11:35:24 -0700
commitd0021cb0fb7c28ff9f496f02b7bb3b2ab0722304 (patch)
tree06ac2bff482e1fca69e4a9d5ed54cf5b9caa70c4 /src/mesa/program/programopt.c
parenteda4a4ae81481c4b0a300ad91e607a18a8d81cb3 (diff)
downloadexternal_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/programopt.c')
-rw-r--r--src/mesa/program/programopt.c7
1 files changed, 2 insertions, 5 deletions
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;