diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2013-03-15 16:47:46 -0700 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2013-03-29 12:01:01 -0700 |
commit | c770faea0a308ffb858c0125c9e680c6e477efee (patch) | |
tree | 6551062c6a2d18ce9b698a2a6239ce95f691f9dd | |
parent | 57a502518e79d42b014517bf36b297cc68947389 (diff) |
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 <ian.d.romanick@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
-rw-r--r-- | src/glsl/glsl_types.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp index 8b0a248058..419761a7d3 100644 --- a/src/glsl/glsl_types.cpp +++ b/src/glsl/glsl_types.cpp @@ -476,6 +476,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; |