openharmony/third_party_mesa3d
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_mesa3d synced 2024-12-13 02:38:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

glsl: replace binding layout min boundary check

Browse Source 
Use new helper that will in a later patch allow for
compile time constants.

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Timothy Arceri 2015-11-15 00:42:44 +11:00 committed by Timothy Arceri
parent 64710db664
commit e74fe2a844
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/glsl/ast_to_hir.cpp
View File

@ -2550,14 +2550,15 @@ apply_explicit_binding(struct _mesa_glsl_parse_state *state,
return; return;
} }
if (qual->binding < 0) { unsigned qual_binding;
_mesa_glsl_error(loc, state, "binding values must be >= 0"); if (!process_qualifier_constant(state, loc, "binding", qual->binding,
&qual_binding)) {
return; return;
} }
const struct gl_context *const ctx = state->ctx; const struct gl_context *const ctx = state->ctx;
unsigned elements = type->is_array() ? type->arrays_of_arrays_size() : 1; unsigned elements = type->is_array() ? type->arrays_of_arrays_size() : 1;
unsigned max_index = qual->binding + elements - 1; unsigned max_index = qual_binding + elements - 1;
const glsl_type *base_type = type->without_array(); const glsl_type *base_type = type->without_array();
if (base_type->is_interface()) { if (base_type->is_interface()) {
@ -2573,9 +2574,9 @@ apply_explicit_binding(struct _mesa_glsl_parse_state *state,
*/ */
if (qual->flags.q.uniform && if (qual->flags.q.uniform &&
max_index >= ctx->Const.MaxUniformBufferBindings) { max_index >= ctx->Const.MaxUniformBufferBindings) {
_mesa_glsl_error(loc, state, "layout(binding = %d) for %d UBOs exceeds " _mesa_glsl_error(loc, state, "layout(binding = %u) for %d UBOs exceeds "
"the maximum number of UBO binding points (%d)", "the maximum number of UBO binding points (%d)",
qual->binding, elements, qual_binding, elements,
ctx->Const.MaxUniformBufferBindings); ctx->Const.MaxUniformBufferBindings);
return; return;
} }
@ -2591,9 +2592,9 @@ apply_explicit_binding(struct _mesa_glsl_parse_state *state,
*/ */
if (qual->flags.q.buffer && if (qual->flags.q.buffer &&
max_index >= ctx->Const.MaxShaderStorageBufferBindings) { max_index >= ctx->Const.MaxShaderStorageBufferBindings) {
_mesa_glsl_error(loc, state, "layout(binding = %d) for %d SSBOs exceeds " _mesa_glsl_error(loc, state, "layout(binding = %u) for %d SSBOs exceeds "
"the maximum number of SSBO binding points (%d)", "the maximum number of SSBO binding points (%d)",
qual->binding, elements, qual_binding, elements,
ctx->Const.MaxShaderStorageBufferBindings); ctx->Const.MaxShaderStorageBufferBindings);
return; return;
} }
@ -2610,16 +2611,16 @@ apply_explicit_binding(struct _mesa_glsl_parse_state *state,
if (max_index >= limit) { if (max_index >= limit) {
_mesa_glsl_error(loc, state, "layout(binding = %d) for %d samplers " _mesa_glsl_error(loc, state, "layout(binding = %d) for %d samplers "
"exceeds the maximum number of texture image units " "exceeds the maximum number of texture image units "
"(%d)", qual->binding, elements, limit); "(%u)", qual_binding, elements, limit);
return; return;
} }
} else if (base_type->contains_atomic()) { } else if (base_type->contains_atomic()) {
assert(ctx->Const.MaxAtomicBufferBindings <= MAX_COMBINED_ATOMIC_BUFFERS); assert(ctx->Const.MaxAtomicBufferBindings <= MAX_COMBINED_ATOMIC_BUFFERS);
if (unsigned(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"
"(%d)", qual->binding, "(%u)", qual_binding,
ctx->Const.MaxAtomicBufferBindings); ctx->Const.MaxAtomicBufferBindings);
return; return;
@ -2641,7 +2642,7 @@ apply_explicit_binding(struct _mesa_glsl_parse_state *state,
} }
var->data.explicit_binding = true; var->data.explicit_binding = true;
var->data.binding = qual->binding; var->data.binding = qual_binding;
return; return;
} }