From 951632253f4f37ce058e2466bca5b96bb43ccfbf Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 21 Apr 2010 23:15:08 -0700 Subject: [PATCH] ir_reader: Fix for swizzles. --- ir_reader.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ir_reader.cpp b/ir_reader.cpp index 44fbb33a5d4..976af2ab128 100644 --- a/ir_reader.cpp +++ b/ir_reader.cpp @@ -645,8 +645,7 @@ read_swizzle(_mesa_glsl_parse_state *st, s_list *list) return NULL; } - unsigned num_components = strlen(swiz->value()); - if (num_components > 4) { + if (strlen(swiz->value()) > 4) { ir_read_error(st, list, "expected a valid swizzle; found %s", swiz->value()); return NULL; @@ -663,7 +662,8 @@ read_swizzle(_mesa_glsl_parse_state *st, s_list *list) if (rvalue == NULL) return NULL; - return ir_swizzle::create(rvalue, swiz->value(), num_components); + return ir_swizzle::create(rvalue, swiz->value(), + rvalue->type->vector_elements); } static ir_constant * -- 2.30.2