From: Eric Anholt <eric@anholt.net>
Date: Mon, 27 Sep 2010 22:48:15 +0000 (-0700)
Subject: glsl: Add validation that a swizzle only references valid channels.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5e8ed7a79b381d559b059987bd99c68d40f641ca;p=mesa.git

glsl: Add validation that a swizzle only references valid channels.

Caught the bug in the previous commit.
---

diff --git a/src/glsl/ir_validate.cpp b/src/glsl/ir_validate.cpp
index e35514aa6f9..70fb939b10a 100644
--- a/src/glsl/ir_validate.cpp
+++ b/src/glsl/ir_validate.cpp
@@ -67,6 +67,7 @@ public:
    virtual ir_visitor_status visit_enter(ir_function_signature *ir);
 
    virtual ir_visitor_status visit_leave(ir_expression *ir);
+   virtual ir_visitor_status visit_leave(ir_swizzle *ir);
 
    virtual ir_visitor_status visit_enter(ir_assignment *ir);
 
@@ -364,6 +365,23 @@ ir_validate::visit_leave(ir_expression *ir)
    return visit_continue;
 }
 
+ir_visitor_status
+ir_validate::visit_leave(ir_swizzle *ir)
+{
+   int chans[4] = {ir->mask.x, ir->mask.y, ir->mask.z, ir->mask.w};
+
+   for (unsigned int i = 0; i < ir->type->vector_elements; i++) {
+      if (chans[i] >= ir->val->type->vector_elements) {
+	 printf("ir_swizzle @ %p specifies a channel not present "
+		"in the value.\n", (void *) ir);
+	 ir->print();
+	 abort();
+      }
+   }
+
+   return visit_continue;
+}
+
 ir_visitor_status
 ir_validate::visit(ir_variable *ir)
 {