projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glsl: Drop the round-trip through ast_type_specifier for many builtin types.
[mesa.git]
/
src
/
glsl
/
ir.cpp
diff --git
a/src/glsl/ir.cpp
b/src/glsl/ir.cpp
index fb9a50e1aa57f025e8852f5209d958c4914d746f..1ba87515ea7024061b3a6905f7f95a7286bd8a20 100644
(file)
--- a/
src/glsl/ir.cpp
+++ b/
src/glsl/ir.cpp
@@
-1026,9
+1026,11
@@
ir_loop::ir_loop()
ir_dereference_variable::ir_dereference_variable(ir_variable *var)
{
ir_dereference_variable::ir_dereference_variable(ir_variable *var)
{
+ assert(var != NULL);
+
this->ir_type = ir_type_dereference_variable;
this->var = var;
this->ir_type = ir_type_dereference_variable;
this->var = var;
- this->type =
(var != NULL) ? var->type : glsl_type::error_
type;
+ this->type =
var->
type;
}
}
@@
-1456,22
+1458,15
@@
ir_function::has_user_signature()
}
}
-ir_
call
*
-ir_
call::get_error_instruction(void *
ctx)
+ir_
rvalue
*
+ir_
rvalue::error_value(void *mem_
ctx)
{
{
- ir_
call *call = new(ctx) ir_call
;
+ ir_
rvalue *v = new(mem_ctx) ir_rvalue
;
-
call
->type = glsl_type::error_type;
- return
call
;
+
v
->type = glsl_type::error_type;
+ return
v
;
}
}
-void
-ir_call::set_callee(ir_function_signature *sig)
-{
- assert((this->type == NULL) || (this->type == sig->return_type));
-
- this->callee = sig;
-}
void
visit_exec_list(exec_list *list, ir_visitor *visitor)
void
visit_exec_list(exec_list *list, ir_visitor *visitor)