mesa: fix GL_MAX_NAME_LENGTH query for tessellation shaders

This fixes some piglit subtests for ARB_program_interface_query.

V3: remove some of the unnecessary parentheses
V2: fix alignment

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Timothy Arceri 2016-01-06 11:27:05 +11:00
parent e1e1b67878
commit 3d402d4450

View file

@ -764,8 +764,12 @@ _mesa_program_resource_find_index(struct gl_shader_program *shProg,
static bool
add_index_to_name(struct gl_program_resource *res)
{
bool add_index = !(((res->Type == GL_PROGRAM_INPUT) &&
res->StageReferences & (1 << MESA_SHADER_GEOMETRY)));
bool add_index = !((res->Type == GL_PROGRAM_INPUT &&
res->StageReferences & (1 << MESA_SHADER_GEOMETRY |
1 << MESA_SHADER_TESS_CTRL |
1 << MESA_SHADER_TESS_EVAL)) ||
(res->Type == GL_PROGRAM_OUTPUT &&
res->StageReferences & 1 << MESA_SHADER_TESS_CTRL));
/* Transform feedback varyings have array index already appended
* in their names.