Module: Mesa
Branch: master
Commit: 437ed05708e640a547994efd9186f6f4b02dc160
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=437ed05708e640a547994efd9186f6f4b02dc160
Author: Erik Faye-Lund <erik.faye-l...@collabora.com>
Date: Mon Mar 29 12:45:41 2021 +0200
compiler/glsl: do not cast struct to string
When formatting the error here, we're currently casting an
ast_type_qualifier as a string.
But we don't need to use a string here at all, because we know from
context exactly what qualifier we're talking about, because the
if-statements explicitly check for the uniform-qualifier.
So let's just hard-code the format-string to reference the right
qualifier instead of the string-shenanigans. The latter cannot do the
right thing.
Fixes: 2d03f48a65a ("glsl: Add parsing for GLSL uniform blocks.")
Reviewed-by: Eric Anholt <e...@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9911>
---
src/compiler/glsl/glsl_parser.yy | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy
index 13f5d49df6c..ec66e680a2b 100644
--- a/src/compiler/glsl/glsl_parser.yy
+++ b/src/compiler/glsl/glsl_parser.yy
@@ -1894,11 +1894,11 @@ layout_qualifier_id:
if ($$.flags.q.uniform && !state->has_uniform_buffer_objects()) {
_mesa_glsl_error(& @1, state,
"#version 140 / GL_ARB_uniform_buffer_object "
- "layout qualifier `%s' is used", $1);
+ "layout qualifier `uniform' is used");
} else if ($$.flags.q.uniform && state->ARB_uniform_buffer_object_warn) {
_mesa_glsl_warning(& @1, state,
"#version 140 / GL_ARB_uniform_buffer_object "
- "layout qualifier `%s' is used", $1);
+ "layout qualifier `uniform' is used");
}
}
;
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
