Mesa (master): glsl: Request an Nx1 type instance in ir_quadop_vector lowering pass.
Kenneth Graunke
kwg at kemper.freedesktop.org
Mon Jul 30 22:18:11 UTC 2012
Module: Mesa
Branch: master
Commit: 9d998a2a592ed688c90b408604b9dbec26b752ff
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9d998a2a592ed688c90b408604b9dbec26b752ff
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Thu Mar 22 15:09:40 2012 -0700
glsl: Request an Nx1 type instance in ir_quadop_vector lowering pass.
No types have 0 columns. The glsl_type::get_instance method contains
if ((rows < 1) || (rows > 4) || (columns < 1) || (columns > 4))
return error_type;
To get a vector, use columns = 1.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Olivier Galibert <galibert at pobox.com>
---
src/glsl/lower_vector.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/glsl/lower_vector.cpp b/src/glsl/lower_vector.cpp
index 57963a1..0cd6909 100644
--- a/src/glsl/lower_vector.cpp
+++ b/src/glsl/lower_vector.cpp
@@ -183,7 +183,7 @@ lower_vector_visitor::handle_rvalue(ir_rvalue **rvalue)
if (assigned > 0) {
ir_constant *const c =
new(mem_ctx) ir_constant(glsl_type::get_instance(expr->type->base_type,
- assigned, 0),
+ assigned, 1),
&d);
ir_dereference *const lhs = new(mem_ctx) ir_dereference_variable(temp);
ir_assignment *const assign =
More information about the mesa-commit
mailing list