Mesa (master): glsl: Add missing bool case in glsl_type::get_scalar_type
Ian Romanick
idr at kemper.freedesktop.org
Fri Mar 29 19:02:52 UTC 2013
Module: Mesa
Branch: master
Commit: c770faea0a308ffb858c0125c9e680c6e477efee
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c770faea0a308ffb858c0125c9e680c6e477efee
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Mar 15 16:47:46 2013 -0700
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 at intel.com>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
---
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 8b0a248..419761a 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;
More information about the mesa-commit
mailing list