diff options
author | Ian Romanick <ian.d.romanick@intel.com> | 2013-03-15 16:47:46 -0700 |
---|---|---|
committer | Andreas Boll <andreas.boll.dev@gmail.com> | 2013-04-17 12:57:37 +0200 |
commit | 365525ef129fd09e0c9a891ac9ff7f3520359d05 (patch) | |
tree | 4a656dbbc7b3e23d7be9afbc67ba45c5320583fa | |
parent | d0cb3a03c58be0b6dff2e2fae7c4079fff50584f (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>
(cherry picked from commit c770faea0a308ffb858c0125c9e680c6e477efee)
-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 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; |