From 365525ef129fd09e0c9a891ac9ff7f3520359d05 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Fri, 15 Mar 2013 16:47:46 -0700 Subject: glsl: Add missing bool case in glsl_type::get_scalar_type Since the case was missing bec4->get_scalar_type() would return bvec4, but vec4->get_scalar_type() would return float. NOTE: This is a candidate for stable branches. Signed-off-by: Ian Romanick Reviewed-by: Matt Turner Reviewed-by: Kenneth Graunke Reviewed-by: Jordan Justen (cherry picked from commit c770faea0a308ffb858c0125c9e680c6e477efee) --- src/glsl/glsl_types.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp index 2aa51f0b38..e43a1a5b22 100644 --- a/src/glsl/glsl_types.cpp +++ b/src/glsl/glsl_types.cpp @@ -340,6 +340,8 @@ const glsl_type *glsl_type::get_scalar_type() const return int_type; case GLSL_TYPE_FLOAT: return float_type; + case GLSL_TYPE_BOOL: + return bool_type; default: /* Handle everything else */ return type; -- cgit v1.2.3