fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-18 13:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: create validate_component_layout_for_type() helper

Browse source 
This will be used in the following patch.

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10763>
(cherry picked from commit 1a71d6aa6e)
This commit is contained in:
Timothy Arceri 2021-05-12 15:42:44 +10:00 • committed by Eric Engestrom
parent 8c9b65c8be
commit 791ef86daa
2 changed files with 32 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -805,7 +805,7 @@
"description": "glsl: create validate_component_layout_for_type() helper",
"nominated": false,
"nomination_type": null,
"resolution": 4,
"resolution": 1,
"master_sha": null,
"because_sha": null
},

57
src/compiler/glsl/ast_to_hir.cpp
View file

@ -2740,6 +2740,33 @@ is_allowed_invariant(ir_variable *var, struct _mesa_glsl_parse_state *state)
return false;
}
static void
validate_component_layout_for_type(struct _mesa_glsl_parse_state *state,
YYLTYPE *loc, const glsl_type *type,
unsigned qual_component)
{
type = type->without_array();
unsigned components = type->component_slots();
if (type->is_matrix() || type->is_struct()) {
_mesa_glsl_error(loc, state, "component layout qualifier "
"cannot be applied to a matrix, a structure, "
"a block, or an array containing any of these.");
} else if (components > 4 && type->is_64bit()) {
_mesa_glsl_error(loc, state, "component layout qualifier "
"cannot be applied to dvec%u.",
components / 2);
} else if (qual_component != 0 && (qual_component + components - 1) > 3) {
_mesa_glsl_error(loc, state, "component overflow (%u > 3)",
(qual_component + components - 1));
} else if (qual_component == 1 && type->is_64bit()) {
/* We don't bother checking for 3 as it should be caught by the
* overflow check above.
*/
_mesa_glsl_error(loc, state, "doubles cannot begin at component 1 or 3");
}
}
/**
* Matrix layout qualifiers are only allowed on certain types
*/
@ -3712,32 +3739,10 @@ apply_layout_qualifier_to_variable(const struct ast_type_qualifier *qual,
unsigned qual_component;
if (process_qualifier_constant(state, loc, "component",
qual->component, &qual_component)) {
const glsl_type *type = var->type->without_array();
unsigned components = type->component_slots();
if (type->is_matrix() || type->is_struct()) {
_mesa_glsl_error(loc, state, "component layout qualifier "
"cannot be applied to a matrix, a structure, "
"a block, or an array containing any of "
"these.");
} else if (components > 4 && type->is_64bit()) {
_mesa_glsl_error(loc, state, "component layout qualifier "
"cannot be applied to dvec%u.",
components / 2);
} else if (qual_component != 0 &&
(qual_component + components - 1) > 3) {
_mesa_glsl_error(loc, state, "component overflow (%u > 3)",
(qual_component + components - 1));
} else if (qual_component == 1 && type->is_64bit()) {
/* We don't bother checking for 3 as it should be caught by the
* overflow check above.
*/
_mesa_glsl_error(loc, state, "doubles cannot begin at "
"component 1 or 3");
} else {
var->data.explicit_component = true;
var->data.location_frac = qual_component;
}
validate_component_layout_for_type(state, loc, var->type,
qual_component);
var->data.explicit_component = true;
var->data.location_frac = qual_component;
}
}
} else if (qual->flags.q.explicit_index) {