- leaner build part 6 of X
 - Get rid of the ARB_blend_func_extended, ARB_explicit_attrib_location, ARB_seamless_cube_map, ARB_texture_multisample extension EXT_provoking_vertex, EXT_vertex_array_bgra and AMD_seamless_cubemap_per_texture extensions
#CORE-7499

svn path=/trunk/; revision=60505
This commit is contained in:
Jérôme Gardou 2013-10-01 21:37:39 +00:00
parent 18cdde3bad
commit dc33940df2
49 changed files with 42 additions and 1124 deletions

View file

@ -4193,25 +4193,6 @@ yyreduce:
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
if (state->ARB_explicit_attrib_location_enable) {
/* FINISHME: Handle 'index' once GL_ARB_blend_func_exteneded and
* FINISHME: GLSL 1.30 (or later) are supported.
*/
if (strcmp("location", (yyvsp[(1) - (3)].identifier)) == 0) {
got_one = true;
(yyval.type_qualifier).flags.q.explicit_location = 1;
if ((yyvsp[(3) - (3)].n) >= 0) {
(yyval.type_qualifier).location = (yyvsp[(3) - (3)].n);
} else {
_mesa_glsl_error(& (yylsp[(3) - (3)]), state,
"invalid location %d specified\n", (yyvsp[(3) - (3)].n));
YYERROR;
}
}
}
/* If the identifier didn't match any known layout identifiers,
* emit an error.
*/
@ -4219,10 +4200,6 @@ yyreduce:
_mesa_glsl_error(& (yylsp[(1) - (3)]), state, "unrecognized layout identifier "
"`%s'\n", (yyvsp[(1) - (3)].identifier));
YYERROR;
} else if (state->ARB_explicit_attrib_location_warn) {
_mesa_glsl_warning(& (yylsp[(1) - (3)]), state,
"GL_ARB_explicit_attrib_location layout "
"identifier `%s' used\n", (yyvsp[(1) - (3)].identifier));
}
}
break;