fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 15:30:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: validate and store component layout qualifier in GLSL IR

Browse source 
We make use of the existing IR field location_frac used for tracking
component locations.

Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Timothy Arceri 2015-11-11 06:24:53 +11:00
parent 2d9936a686
commit 94438578d2
2 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3346,10 +3346,42 @@ apply_layout_qualifier_to_variable(const struct ast_type_qualifier *qual,
if (qual->flags.q.explicit_location) { if (qual->flags.q.explicit_location) {
apply_explicit_location(qual, var, state, loc); apply_explicit_location(qual, var, state, loc);
if (qual->flags.q.explicit_component) {
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_record()) {
_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 (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_double()) {
/* 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;
}
}
}
} else if (qual->flags.q.explicit_index) { } else if (qual->flags.q.explicit_index) {
if (!qual->flags.q.subroutine_def) if (!qual->flags.q.subroutine_def)
_mesa_glsl_error(loc, state, _mesa_glsl_error(loc, state,
"explicit index requires explicit location"); "explicit index requires explicit location");
} else if (qual->flags.q.explicit_component) {
_mesa_glsl_error(loc, state,
"explicit component requires explicit location");
} }
if (qual->flags.q.explicit_binding) { if (qual->flags.q.explicit_binding) {
@ -7007,6 +7039,12 @@ ast_interface_block::hir(exec_list *instructions,
"Interface block sets both readonly and writeonly"); "Interface block sets both readonly and writeonly");
} }
if (this->layout.flags.q.explicit_component) {
_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.");
}
unsigned qual_stream; unsigned qual_stream;
if (!process_qualifier_constant(state, &loc, "stream", this->layout.stream, if (!process_qualifier_constant(state, &loc, "stream", this->layout.stream,
&qual_stream) || &qual_stream) ||

5
src/compiler/glsl/ir.h
View file

@ -702,6 +702,11 @@ public:
*/ */
unsigned explicit_binding:1; unsigned explicit_binding:1;
/**
* Was an initial component explicitly set in the shader?
*/
unsigned explicit_component:1;
/** /**
* Does this variable have an initializer? * Does this variable have an initializer?
* *