Mesa (master): compiler/glsl: fix volatile string

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Apr 9 04:21:34 UTC 2021


Module: Mesa
Branch: master
Commit: d5e0be9342d032ce1180e6b77df22e698e688fbe
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d5e0be9342d032ce1180e6b77df22e698e688fbe

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Wed Mar 31 10:09:58 2021 +0200

compiler/glsl: fix volatile string

The reason the member has a leading underscore is because volatile is a
keyword in C. We don't want to carry that detail into the error-string,
so let's drop the underscore.

Reviewed-by: Matt Turner <mattst88 at gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9896>

---

 src/compiler/glsl/ast_type.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/glsl/ast_type.cpp b/src/compiler/glsl/ast_type.cpp
index 4e09cc041ad..6d301139798 100644
--- a/src/compiler/glsl/ast_type.cpp
+++ b/src/compiler/glsl/ast_type.cpp
@@ -876,7 +876,7 @@ ast_type_qualifier::validate_flags(YYLTYPE *loc,
                     bad.flags.q.early_fragment_tests ? " early_fragment_tests" : "",
                     bad.flags.q.explicit_image_format ? " image_format" : "",
                     bad.flags.q.coherent ? " coherent" : "",
-                    bad.flags.q._volatile ? " _volatile" : "",
+                    bad.flags.q._volatile ? " volatile" : "",
                     bad.flags.q.restrict_flag ? " restrict_flag" : "",
                     bad.flags.q.read_only ? " read_only" : "",
                     bad.flags.q.write_only ? " write_only" : "",



More information about the mesa-commit mailing list