- leaner build part 7 of X
 - Get rid of the ARB_draw_elements and ARB_fragment_coord_conventions extensions
CORE-7499

svn path=/trunk/; revision=60509
This commit is contained in:
Jérôme Gardou 2013-10-01 22:44:06 +00:00
parent 94e68da9c3
commit 0ac85330a1
40 changed files with 77 additions and 795 deletions

View file

@ -4111,12 +4111,6 @@ yyreduce:
}
(yyval.type_qualifier).flags.i = (yyvsp[(1) - (3)].type_qualifier).flags.i | (yyvsp[(3) - (3)].type_qualifier).flags.i;
if ((yyvsp[(1) - (3)].type_qualifier).flags.q.explicit_location)
(yyval.type_qualifier).location = (yyvsp[(1) - (3)].type_qualifier).location;
if ((yyvsp[(3) - (3)].type_qualifier).flags.q.explicit_location)
(yyval.type_qualifier).location = (yyvsp[(3) - (3)].type_qualifier).location;
}
break;
@ -4129,23 +4123,6 @@ yyreduce:
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
/* Layout qualifiers for ARB_fragment_coord_conventions. */
if (!got_one && state->ARB_fragment_coord_conventions_enable) {
if (strcmp((yyvsp[(1) - (1)].identifier), "origin_upper_left") == 0) {
got_one = true;
(yyval.type_qualifier).flags.q.origin_upper_left = 1;
} else if (strcmp((yyvsp[(1) - (1)].identifier), "pixel_center_integer") == 0) {
got_one = true;
(yyval.type_qualifier).flags.q.pixel_center_integer = 1;
}
if (got_one && state->ARB_fragment_coord_conventions_warn) {
_mesa_glsl_warning(& (yylsp[(1) - (1)]), state,
"GL_ARB_fragment_coord_conventions layout "
"identifier `%s' used\n", (yyvsp[(1) - (1)].identifier));
}
}
/* Layout qualifiers for AMD/ARB_conservative_depth. */
if (!got_one &&
(state->AMD_conservative_depth_enable ||