diff options
| author | Timothy Arceri <timothy.arceri@collabora.com> | 2016-01-06 11:27:05 +1100 |
|---|---|---|
| committer | Timothy Arceri <timothy.arceri@collabora.com> | 2016-01-06 12:01:09 +1100 |
| commit | 3d402d445003f00478d7eb51eec8e4f31fef9352 (patch) | |
| tree | b2427bd80e7036570d2f77f1237419b8f6d1bc31 /src/mesa/main/shader_query.cpp | |
| parent | e1e1b678785e112326cc68c40990460deff05abc (diff) | |
| download | external_mesa3d-3d402d445003f00478d7eb51eec8e4f31fef9352.zip external_mesa3d-3d402d445003f00478d7eb51eec8e4f31fef9352.tar.gz external_mesa3d-3d402d445003f00478d7eb51eec8e4f31fef9352.tar.bz2 | |
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>
Diffstat (limited to 'src/mesa/main/shader_query.cpp')
| -rw-r--r-- | src/mesa/main/shader_query.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp index e526119..b25732a 100644 --- a/src/mesa/main/shader_query.cpp +++ b/src/mesa/main/shader_query.cpp @@ -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. |