summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Turner <[email protected]>2014-05-31 11:20:37 -0700
committerMatt Turner <[email protected]>2014-06-03 17:58:34 -0700
commit943cc7ff173bc815553d9608ac73de8dc29729d3 (patch)
tree9ee7cb247f3dba4ed5851d095c3303d2bf21d147
parent3540b5eb55d07f46f471956dd4fc18d5102b26f4 (diff)
glsl: Reorder ir_type_* enum for easier comparisons.
Makes checking whether an object is an ir_dereference, an ir_rvalue, or an ir_jump simpler. Since ir_dereference is a subclass or ir_rvalue, list its subtypes first so that they can both generate nice code. Reviewed-by: Juha-Pekka Heikkila <[email protected]>
-rw-r--r--src/glsl/ir.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index 02784e1f369..57552e0f567 100644
--- a/src/glsl/ir.h
+++ b/src/glsl/ir.h
@@ -64,23 +64,23 @@ enum ir_node_type {
* \c ir_instruction::ir_type has not been initialized.
*/
ir_type_unset,
- ir_type_variable,
- ir_type_assignment,
- ir_type_call,
- ir_type_constant,
ir_type_dereference_array,
ir_type_dereference_record,
ir_type_dereference_variable,
- ir_type_discard,
+ ir_type_constant,
ir_type_expression,
+ ir_type_swizzle,
+ ir_type_texture,
+ ir_type_variable,
+ ir_type_assignment,
+ ir_type_call,
ir_type_function,
ir_type_function_signature,
ir_type_if,
ir_type_loop,
ir_type_loop_jump,
ir_type_return,
- ir_type_swizzle,
- ir_type_texture,
+ ir_type_discard,
ir_type_emit_vertex,
ir_type_end_primitive,
ir_type_max /**< maximum ir_type enum number, for validation */