Mesa (master): glsl: Corrected some typos and error messages
Andres Gomez
tanty at kemper.freedesktop.org
Wed May 3 20:18:22 UTC 2017
Module: Mesa
Branch: master
Commit: e4ae4d27895f3657e3033ddf3f59d3ca4b320808
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e4ae4d27895f3657e3033ddf3f59d3ca4b320808
Author: Andres Gomez <agomez at igalia.com>
Date: Wed May 3 21:35:24 2017 +0300
glsl: Corrected some typos and error messages
v2: left code style/formatting corrections out.
Signed-off-by: Andres Gomez <agomez at igalia.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
---
src/compiler/glsl/ast_to_hir.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
index 1159b2cdfb..0703ed664c 100644
--- a/src/compiler/glsl/ast_to_hir.cpp
+++ b/src/compiler/glsl/ast_to_hir.cpp
@@ -2896,7 +2896,7 @@ apply_explicit_binding(struct _mesa_glsl_parse_state *state,
assert(ctx->Const.MaxAtomicBufferBindings <= MAX_COMBINED_ATOMIC_BUFFERS);
if (qual_binding >= ctx->Const.MaxAtomicBufferBindings) {
_mesa_glsl_error(loc, state, "layout(binding = %d) exceeds the "
- " maximum number of atomic counter buffer bindings"
+ "maximum number of atomic counter buffer bindings "
"(%u)", qual_binding,
ctx->Const.MaxAtomicBufferBindings);
@@ -2908,7 +2908,7 @@ apply_explicit_binding(struct _mesa_glsl_parse_state *state,
assert(ctx->Const.MaxImageUnits <= MAX_IMAGE_UNITS);
if (max_index >= ctx->Const.MaxImageUnits) {
_mesa_glsl_error(loc, state, "Image binding %d exceeds the "
- " maximum number of image units (%d)", max_index,
+ "maximum number of image units (%d)", max_index,
ctx->Const.MaxImageUnits);
return;
}
@@ -2916,7 +2916,8 @@ apply_explicit_binding(struct _mesa_glsl_parse_state *state,
} else {
_mesa_glsl_error(loc, state,
"the \"binding\" qualifier only applies to uniform "
- "blocks, opaque variables, or arrays thereof");
+ "blocks, storage blocks, opaque variables, or arrays "
+ "thereof");
return;
}
@@ -7470,7 +7471,7 @@ ast_interface_block::hir(exec_list *instructions,
return NULL;
} else {
if (expl_align == 0 || expl_align & (expl_align - 1)) {
- _mesa_glsl_error(&loc, state, "align layout qualifier in not a "
+ _mesa_glsl_error(&loc, state, "align layout qualifier is not a "
"power of 2.");
return NULL;
}
More information about the mesa-commit
mailing list