[Mesa-dev] Merge of glsl2 branch to master

[Brian Paul]

On Wed, Aug 11, 2010 at 6:06 PM, Ian Romanick <idr at freedesktop.org> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Ian Romanick wrote:
>> Brian Paul wrote:
>>> It looks like function prototypes aren't handled properly.
>>
>>> I've added a new piglit test for this:
>>
>>> $ bin/shader_runner tests/shaders/glsl-function-prototype.shader_test -auto
>>
>>> GLSL2 error: 0:3(1): error: empty declaration list
>>
>>> Failed to compile FS: 0:3(1): error: empty declaration list
>>
>>> PIGLIT: {'result': 'fail' }
>>
>>
>>> It's important that this gets fixed before the merge.  Thanks.
>>
>> half is a reserved word in GLSL.  This test case also fails on AMD's
>> closed-source driver.  From section 3.6 of the GLSL 1.10 spec:
>>
>> "The following are the keywords reserved for future use. Using them will
>> result in an error:
>>
>>   ...
>>   long   short   double     half  fixed  unsigned
>>   ..."
>>
>> We should, however, generate a more useful error message.  I've
>> submitted a bug for this.
>>
>> https://bugs.freedesktop.org/show_bug.cgi?id=29519
>>
>> Changing the name _half fails with a different error in the linker on
>> the i965 driver and incorrect results on swrast.  I've submitted a bug
>> for this, and I'll investigate it today.
>>
>> https://bugs.freedesktop.org/show_bug.cgi?id=29520
>
> Both of these turned out to be much easier to fix than I had
> anticipated.  The function prototype bug was especially silly.  Ugh.
> Let me know if there are other problems in these areas.

Thanks.  I'll do some more testing tomorrow.

-Brian