nir: Use a single list for all shader variables

[mesa.git] / src / compiler / glsl / lower_vector.cpp

diff --git a/src/compiler/glsl/lower_vector.cpp b/src/compiler/glsl/lower_vector.cpp
index a658410ae6fd20e0a894b35ad3658fb3db59faf3..4024644b0628f11193584a0e40e29b3b2bdf2dae 100644 (file)
--- a/src/compiler/glsl/lower_vector.cpp
+++ b/src/compiler/glsl/lower_vector.cpp
@@ -58,7 +58,7 @@ public:
  * Extended swizzles consist of access of a single vector source (with possible
  * per component negation) and the constants -1, 0, or 1.
  */
-bool
+static bool
 is_extended_swizzle(ir_expression *ir)
 {
    /* Track any variables that are accessed by this expression.
@@ -133,7 +133,7 @@ lower_vector_visitor::handle_rvalue(ir_rvalue **rvalue)
     */
    void *const mem_ctx = expr;
 
-   assert(expr->type->vector_elements == expr->get_num_operands());
+   assert(expr->type->vector_elements == expr->num_operands);
 
    /* Generate a temporary with the same type as the ir_quadop_operation.
     */