fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glsl: Eliminate the global check in validate_explicit_location

Browse source 
Since the separation of ir_var_function_in and ir_var_shader_in (similar
for out), this check is no longer necessary.  Previously, global_scope
was the only way to tell which was which.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
This commit is contained in:
Ian Romanick 2013-09-25 11:01:07 -07:00
parent 8f00a77fbc
commit 2cb760d994
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/glsl/ast_to_hir.cpp
View file

@ -2052,7 +2052,6 @@ validate_explicit_location(const struct ast_type_qualifier *qual,
struct _mesa_glsl_parse_state *state,
YYLTYPE *loc)
{
const bool global_scope = (state->current_function == NULL);
bool fail = false;
const char *string = "";
@ -2064,7 +2063,7 @@ validate_explicit_location(const struct ast_type_qualifier *qual,
*/
switch (state->target) {
case vertex_shader:
if (!global_scope || (var->mode != ir_var_shader_in)) {
if (var->mode != ir_var_shader_in) {
fail = true;
string = "input";
}
@ -2077,7 +2076,7 @@ validate_explicit_location(const struct ast_type_qualifier *qual,
return;
case fragment_shader:
if (!global_scope || (var->mode != ir_var_shader_out)) {
if (var->mode != ir_var_shader_out) {
fail = true;
string = "output";
}