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

glsl: Remove ubo_qualifiers_allowed variable.

Browse source 
No longer used.

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
(cherry picked from commit 921ef55a72)
This commit is contained in:
Matt Turner 2013-08-15 11:14:00 -07:00 • committed by Ian Romanick
parent 368fc4f3ec
commit c1c076dd8d
4 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/glsl/ast.h
View file

@ -627,12 +627,6 @@ public:
* is used to note these cases when no type is specified.
*/
int invariant;
/**
* Flag indicating that these declarators are in a uniform block,
* allowing UBO type qualifiers.
*/
bool ubo_qualifiers_allowed;
};

5
src/glsl/ast_to_hir.cpp
View file

@ -1949,7 +1949,6 @@ apply_type_qualifier_to_variable(const struct ast_type_qualifier *qual,
ir_variable *var,
struct _mesa_glsl_parse_state *state,
YYLTYPE *loc,
bool ubo_qualifiers_allowed,
bool is_parameter)
{
if (qual->flags.q.invariant) {
@ -2735,7 +2734,7 @@ ast_declarator_list::hir(exec_list *instructions,
}
apply_type_qualifier_to_variable(& this->type->qualifier, var, state,
& loc, this->ubo_qualifiers_allowed, false);
& loc, false);
if (this->type->qualifier.flags.q.invariant) {
if ((state->target == vertex_shader) &&
@ -3230,7 +3229,7 @@ ast_parameter_declarator::hir(exec_list *instructions,
* for function parameters the default mode is 'in'.
*/
apply_type_qualifier_to_variable(& this->type->qualifier, var, state, & loc,
false, true);
true);
/* From page 17 (page 23 of the PDF) of the GLSL 1.20 spec:
*

1
src/glsl/glsl_parser.yy
View file

@ -2251,7 +2251,6 @@ member_declaration:
$$ = new(ctx) ast_declarator_list(type);
$$->set_location(yylloc);
$$->ubo_qualifiers_allowed = true;
$$->declarations.push_degenerate_list_at_head(& $2->link);
}

1
src/glsl/glsl_parser_extras.cpp
View file

@ -1199,7 +1199,6 @@ ast_declarator_list::ast_declarator_list(ast_fully_specified_type *type)
{
this->type = type;
this->invariant = false;
this->ubo_qualifiers_allowed = false;
}
void