Mesa (master): glsl: Reorder ir_type_* enum for easier comparisons.

Matt Turner mattst88 at kemper.freedesktop.org
Wed Jun 4 00:59:27 UTC 2014


Module: Mesa
Branch: master
Commit: 943cc7ff173bc815553d9608ac73de8dc29729d3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=943cc7ff173bc815553d9608ac73de8dc29729d3

Author: Matt Turner <mattst88 at gmail.com>
Date:   Sat May 31 11:20:37 2014 -0700

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 <juhapekka.heikkila at gmail.com>

---

 src/glsl/ir.h |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index 02784e1..57552e0 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 */




More information about the mesa-commit mailing list