Module: Mesa Branch: 9.1 Commit: c18d48da4116b0c7e5a4aa6e0ce3c8edf64fbab1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c18d48da4116b0c7e5a4aa6e0ce3c8edf64fbab1
Author: Ian Romanick <[email protected]> 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 <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Jordan Justen <[email protected]> (cherry picked from commit c770faea0a308ffb858c0125c9e680c6e477efee) --- 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 02d85b8..dee9709 100644 --- a/src/glsl/glsl_types.cpp +++ b/src/glsl/glsl_types.cpp @@ -446,6 +446,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; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
