Mesa (master): glsl: Pass type to is_valid_default_precision_type instead of name
Ian Romanick
idr at kemper.freedesktop.org
Wed Aug 21 14:46:38 UTC 2013
Module: Mesa
Branch: master
Commit: b15b62c54c0e3c10aaf8573a62acfcdc93979b0d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b15b62c54c0e3c10aaf8573a62acfcdc93979b0d
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Aug 9 15:15:45 2013 -0700
glsl: Pass type to is_valid_default_precision_type instead of name
This is used by the next patch.
Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Cc: "9.2" <mesa-stable at lists.freedesktop.org>
---
src/glsl/ast_to_hir.cpp | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index c439391..88d9fd6 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -4225,10 +4225,8 @@ ast_iteration_statement::hir(exec_list *instructions,
* version.
*/
static bool
-is_valid_default_precision_type(const struct _mesa_glsl_parse_state *state,
- const char *type_name)
+is_valid_default_precision_type(const struct glsl_type *const type)
{
- const struct glsl_type *type = state->symbols->get_type(type_name);
if (type == NULL)
return false;
@@ -4280,7 +4278,10 @@ ast_type_specifier::hir(exec_list *instructions,
"arrays");
return NULL;
}
- if (!is_valid_default_precision_type(state, this->type_name)) {
+
+ const struct glsl_type *const type =
+ state->symbols->get_type(this->type_name);
+ if (!is_valid_default_precision_type(type)) {
_mesa_glsl_error(&loc, state,
"default precision statements apply only to "
"float, int, and sampler types");
More information about the mesa-commit
mailing list