glsl: Fix g++ initializer order warning
authorBrian Paul <brianp@vmware.com>
Mon, 22 May 2017 12:52:45 +0000 (06:52 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 25 May 2017 16:35:11 +0000 (10:35 -0600)
Fixes this warning:
In file included from ../../../src/compiler/glsl/ir.cpp:25:0:
../../../src/compiler/glsl/ir.h: In constructor 'ir_swizzle::ir_swizzle(ir_rvalue*, ir_swizzle_mask)':
../../../src/compiler/glsl/ir.h:1955:20: warning: 'ir_swizzle::mask' will be initialized after [-Wreorder]
    ir_swizzle_mask mask;
                    ^
../../../src/compiler/glsl/ir.h:1954:15: warning:   'ir_rvalue* ir_swizzle::val' [-Wreorder]
    ir_rvalue *val;
               ^
../../../src/compiler/glsl/ir.cpp:1592:1: warning:   when initialized here [-Wreorder]
 ir_swizzle::ir_swizzle(ir_rvalue *val, ir_swizzle_mask mask)
 ^

Reviewed-by: Matt Turner <mattst88@gmail.com>
src/compiler/glsl/ir.cpp

index 2d0c4c051abb118810d87a8b138b670fa29b323d..78889bd6d3fc4eb9bb9f9945541872c7a1ba3f01 100644 (file)
@@ -1590,7 +1590,7 @@ ir_swizzle::ir_swizzle(ir_rvalue *val, const unsigned *comp,
 }
 
 ir_swizzle::ir_swizzle(ir_rvalue *val, ir_swizzle_mask mask)
-   : ir_rvalue(ir_type_swizzle), mask(mask), val(val)
+   : ir_rvalue(ir_type_swizzle), val(val), mask(mask)
 {
    this->type = glsl_type::get_instance(val->type->base_type,
                                        mask.num_components, 1);