fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 08:50:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl/ast: Fix assertion failure when GS input declared as non-array.

Browse source 
Previously, if a geometry shader input was declared as a non-array, we
would flag the proper compiler error, but then before we got a chance
to report it to the client, handle_geometry_shader_input_decl() would
assertion fail.

With this patch, handle_geometry_shader_input_decl() ignores
non-arrays.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Paul Berry 2013-08-12 06:39:23 -07:00
parent 336351e971
commit 91c8fea924
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/glsl/ast_to_hir.cpp
View file

@ -2546,9 +2546,8 @@ process_initializer(ir_variable *var, ast_declaration *decl,
/**
* Do additional processing necessary for geometry shader input array
* declarations (this covers both interface blocks arrays and input variable
* arrays).
* Do additional processing necessary for geometry shader input declarations
* (this covers both interface blocks arrays and bare input variables).
*/
static void
handle_geometry_shader_input_decl(struct _mesa_glsl_parse_state *state,
@ -2559,7 +2558,16 @@ handle_geometry_shader_input_decl(struct _mesa_glsl_parse_state *state,
num_vertices = vertices_per_prim(state->gs_input_prim_type);
}
assert(var->type->is_array());
/* Geometry shader input variables must be arrays. Caller should have
* reported an error for this.
*/
if (!var->type->is_array()) {
assert(state->error);
/* To avoid cascading failures, short circuit the checks below. */
return;
}
if (var->type->length == 0) {
/* Section 4.3.8.1 (Input Layout Qualifiers) of the GLSL 1.50 spec says:
*