[Piglit] [PATCH 02/11] glsl-1.50: Actually test row-major vs. column-major

[Ian Romanick]

On 09/16/2014 08:06 PM, Chris Forbes wrote:
> Are you sure?
> 
> Previously, if the data had been stored in the wrong orientation, you
> should have got (0.25, 0.75, 0.5, 1) due to the 0.5 and 0.75 being off
> the diagonal.

Looking at the test again, I believe you are correct.  I remember I made
this change when I was investigating gles3 conformance failures, but I
don't remember whether this change caused this test to fail.  *shrug*

I'll go ahead and drop it.

> (Or I've completely misunderstood something...)
> 
> On Tue, Sep 9, 2014 at 9:34 AM, Ian Romanick <idr at freedesktop.org> wrote:
>> From: Ian Romanick <ian.d.romanick at intel.com>
>>
>> The way the data was previously laid out, both tests would pass even if
>> the driver stored the data in the wrong orientation.
>>
>> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
>> ---
>>  tests/spec/glsl-1.50/uniform_buffer/gs-mat4-row-major.shader_test | 2 +-
>>  tests/spec/glsl-1.50/uniform_buffer/gs-mat4.shader_test           | 2 +-
>>  2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/tests/spec/glsl-1.50/uniform_buffer/gs-mat4-row-major.shader_test b/tests/spec/glsl-1.50/uniform_buffer/gs-mat4-row-major.shader_test
>> index 7ee7813..39e0fab 100644
>> --- a/tests/spec/glsl-1.50/uniform_buffer/gs-mat4-row-major.shader_test
>> +++ b/tests/spec/glsl-1.50/uniform_buffer/gs-mat4-row-major.shader_test
>> @@ -52,6 +52,6 @@ vertex/float/2
>>  -1.0  1.0
>>
>>  [test]
>> -uniform mat4 m 0.25 0.0 0.0 0.0   0.0 0.0 0.75 0.0   0.0 0.5 0.0 0.0   0.0 0.0 0.0 1.0
>> +uniform mat4 m 0.25 0.5 0.75 1.0   1.0 2.0 3.0 4.0   0.0 0.0 0.0 0.0   -1.0 -2.0 -3.0 -4.0
>>  draw arrays GL_TRIANGLE_FAN 0 4
>>  probe all rgba 0.25 0.5 0.75 1.0
>> diff --git a/tests/spec/glsl-1.50/uniform_buffer/gs-mat4.shader_test b/tests/spec/glsl-1.50/uniform_buffer/gs-mat4.shader_test
>> index d2e1c61..1779990 100644
>> --- a/tests/spec/glsl-1.50/uniform_buffer/gs-mat4.shader_test
>> +++ b/tests/spec/glsl-1.50/uniform_buffer/gs-mat4.shader_test
>> @@ -52,6 +52,6 @@ vertex/float/2
>>  -1.0  1.0
>>
>>  [test]
>> -uniform mat4 m 0.25 0.0 0.0 0.0   0.0 0.0 0.75 0.0   0.0 0.5 0.0 0.0   0.0 0.0 0.0 1.0
>> +uniform mat4 m 0.25 0.5 0.75 1.0   1.0 2.0 3.0 4.0   0.0 0.0 0.0 0.0   -1.0 -2.0 -3.0 -4.0
>>  draw arrays GL_TRIANGLE_FAN 0 4
>>  probe all rgba 0.25 0.5 0.75 1.0
>> --
>> 1.8.1.4
>>
>> _______________________________________________
>> Piglit mailing list
>> Piglit at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/piglit