[Mesa-stable] [Mesa-dev] [PATCH 2/2] glsl/linker: Include the interface name for input and output blocks

[Emil Velikov]

Hi gents,

On 14 May 2016 at 04:11, Kenneth Graunke <kenneth at whitecape.org> wrote:
> On Friday, May 13, 2016 6:42:54 PM PDT Ian Romanick wrote:
>> From: Ian Romanick <ian.d.romanick at intel.com>
>>
>> On my oes_shader_io_blocks branch, this fixes 71
>> dEQP-GLES31.functional.program_interface_query.* tests.
>>
>> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
>> Cc: mesa-stable at lists.freedesktop.org
>> ---
>>  src/compiler/glsl/linker.cpp | 17 ++++++++++++++++-
>>  1 file changed, 16 insertions(+), 1 deletion(-)
>>
>> diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
>> index 41b43ab..3749585 100644
>> --- a/src/compiler/glsl/linker.cpp
>> +++ b/src/compiler/glsl/linker.cpp
>> @@ -3654,6 +3654,21 @@ add_shader_variable(struct gl_shader_program *shProg,
> unsigned stage_mask,
>>     }
>>
>>     default: {
>> +      /* Issue #16 of the ARB_program_interface_query spec says:
>> +       *
>> +       * "* If a variable is a member of an interface block without an
>> +       *    instance name, it is enumerated using just the variable name.
>> +       *
>> +       *  * If a variable is a member of an interface block with an
> instance
>> +       *    name, it is enumerated as "BlockName.Member", where "BlockName"
> is
>> +       *    the name of the interface block (not the instance name) and
>> +       *    "Member" is the name of the variable."
>
> lol..."if it's in a block with one kind of name, use the block's other
> name..."
>
Seems like I forgot to press 'send' a while back.

The function itself is missing in 11.2 branch and from a quick look
there isn't a quick backport. Can anyone prep one or it doesn't make
sense to have one at all in -stable ?

Thanks
Emil