OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl: Corrected some typos and error messages

Browse Source 
v2: left code style/formatting corrections out.

Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Andres Gomez
2017-05-03 21:35:24 +03:00
parent 8aab792e92
commit e4ae4d2789
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/compiler/glsl/ast_to_hir.cpp
View File

@@ -2896,7 +2896,7 @@ apply_explicit_binding(struct _mesa_glsl_parse_state *state,
assert(ctx->Const.MaxAtomicBufferBindings <= MAX_COMBINED_ATOMIC_BUFFERS); assert(ctx->Const.MaxAtomicBufferBindings <= MAX_COMBINED_ATOMIC_BUFFERS);
if (qual_binding >= ctx->Const.MaxAtomicBufferBindings) { if (qual_binding >= ctx->Const.MaxAtomicBufferBindings) {
_mesa_glsl_error(loc, state, "layout(binding = %d) exceeds the " _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, "(%u)", qual_binding,
ctx->Const.MaxAtomicBufferBindings); ctx->Const.MaxAtomicBufferBindings);
@@ -2908,7 +2908,7 @@ apply_explicit_binding(struct _mesa_glsl_parse_state *state,
assert(ctx->Const.MaxImageUnits <= MAX_IMAGE_UNITS); assert(ctx->Const.MaxImageUnits <= MAX_IMAGE_UNITS);
if (max_index >= ctx->Const.MaxImageUnits) { if (max_index >= ctx->Const.MaxImageUnits) {
_mesa_glsl_error(loc, state, "Image binding %d exceeds the " _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); ctx->Const.MaxImageUnits);
return; return;
} }
@@ -2916,7 +2916,8 @@ apply_explicit_binding(struct _mesa_glsl_parse_state *state,
} else { } else {
_mesa_glsl_error(loc, state, _mesa_glsl_error(loc, state,
"the \"binding\" qualifier only applies to uniform " "the \"binding\" qualifier only applies to uniform "
"blocks, opaque variables, or arrays thereof"); "blocks, storage blocks, opaque variables, or arrays "
"thereof");
return; return;
} }
@@ -7470,7 +7471,7 @@ ast_interface_block::hir(exec_list *instructions,
return NULL; return NULL;
} else { } else {
if (expl_align == 0 || expl_align & (expl_align - 1)) { 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."); "power of 2.");
return NULL; return NULL;
} }