Mesa (master): glsl: move ir_var_system_value code
Brian Paul
brianp at kemper.freedesktop.org
Thu Jan 27 04:19:17 UTC 2011
Module: Mesa
Branch: master
Commit: 7baa498ae46668aebf165b9f2b1ddf0f5fe87c07
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7baa498ae46668aebf165b9f2b1ddf0f5fe87c07
Author: Brian Paul <brianp at vmware.com>
Date: Wed Jan 26 21:15:52 2011 -0700
glsl: move ir_var_system_value code
---
src/mesa/program/ir_to_mesa.cpp | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 8d850a6..daedcad 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -1487,7 +1487,6 @@ ir_to_mesa_visitor::visit(ir_dereference_variable *ir)
case ir_var_in:
case ir_var_out:
case ir_var_inout:
- case ir_var_system_value:
/* The linker assigns locations for varyings and attributes,
* including deprecated builtins (like gl_Color), user-assign
* generic attributes (glBindVertexLocation), and
@@ -1510,10 +1509,6 @@ ir_to_mesa_visitor::visit(ir_dereference_variable *ir)
var->type->gl_type,
var->location - VERT_ATTRIB_GENERIC0);
}
- } else if (var->mode == ir_var_system_value) {
- entry = new(mem_ctx) variable_storage(var,
- PROGRAM_SYSTEM_VALUE,
- var->location);
} else {
entry = new(mem_ctx) variable_storage(var,
PROGRAM_OUTPUT,
@@ -1521,6 +1516,11 @@ ir_to_mesa_visitor::visit(ir_dereference_variable *ir)
}
break;
+ case ir_var_system_value:
+ entry = new(mem_ctx) variable_storage(var,
+ PROGRAM_SYSTEM_VALUE,
+ var->location);
+ break;
case ir_var_auto:
case ir_var_temporary:
entry = new(mem_ctx) variable_storage(var, PROGRAM_TEMPORARY,
More information about the mesa-commit
mailing list