Merge branch 'llvm-cliptest-viewport'

[mesa.git] / src / glsl / ir.h

diff --git a/src/glsl/ir.h b/src/glsl/ir.h
index fa246b5e57073308fa7fd15c19ac5c6f5e75bc09..06198e4f3f619a2f29cabc6623f1ebb4c9281aa3 100644 (file)
--- a/src/glsl/ir.h
+++ b/src/glsl/ir.h
@@ -288,6 +288,15 @@ public:
    unsigned pixel_center_integer:1;
    /*@}*/
 
+   /**
+    * Was the location explicitly set in the shader?
+    *
+    * If the location is explicitly set in the shader, it \b cannot be changed
+    * by the linker or by the API (e.g., calls to \c glBindAttribLocation have
+    * no effect).
+    */
+   unsigned explicit_location:1;
+
    /**
     * Storage location of the base of this variable
     *
@@ -691,6 +700,7 @@ enum ir_expression_operation {
    ir_unop_ceil,
    ir_unop_floor,
    ir_unop_fract,
+   ir_unop_round_even,
    /*@}*/
 
    /**