From 86471246f0f3c4c122f605fdd56dd0f5864fc307 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 26 Jan 2011 21:16:14 -0700 Subject: glsl: move ir_var_out code --- src/mesa/program/ir_to_mesa.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/mesa/program') diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index daedcadc9d..b7746a6e30 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -1485,7 +1485,6 @@ ir_to_mesa_visitor::visit(ir_dereference_variable *ir) this->variables.push_tail(entry); break; case ir_var_in: - case ir_var_out: case ir_var_inout: /* The linker assigns locations for varyings and attributes, * including deprecated builtins (like gl_Color), user-assign @@ -1509,12 +1508,13 @@ ir_to_mesa_visitor::visit(ir_dereference_variable *ir) var->type->gl_type, var->location - VERT_ATTRIB_GENERIC0); } - } else { - entry = new(mem_ctx) variable_storage(var, - PROGRAM_OUTPUT, - var->location); - } - + } + break; + case ir_var_out: + assert(var->location != -1); + entry = new(mem_ctx) variable_storage(var, + PROGRAM_OUTPUT, + var->location); break; case ir_var_system_value: entry = new(mem_ctx) variable_storage(var, -- cgit v1.2.3