Fix GLSLTest_ES3.MixedRowAndColumnMajorMatrices_ReadSideEffect

The test had two array sizes swapped, causing failure on vendors that statically verified index-out-of-bound accesses. Bug: angleproject:3831 Change-Id: I8ec32e9c11b38b69f03b1a22e60dfb6c6e82c2a4 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1947123Reviewed-by: Jonah Ryan-Davis <jonahr@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

Fix GLSLTest_ES3.MixedRowAndColumnMajorMatrices_ReadSideEffect
f0be7c81 · Shahbaz Youssefi · Commit Bot · 5e33e647 · f0be7c81
Commit f0be7c81 authored Dec 02, 2019 by Shahbaz Youssefi Committed by Commit Bot Jan 11, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

GLSLTest.cpp src/tests/gl_tests/GLSLTest.cpp +2 -5

No files found.
--- a/src/tests/gl_tests/GLSLTest.cpp
+++ b/src/tests/gl_tests/GLSLTest.cpp
@@ -7104,9 +7104,6 @@ void main()
 // Test that side effects when transforming read operations are preserved.
 TEST_P(GLSLTest_ES3, MixedRowAndColumnMajorMatrices_ReadSideEffect)
 {
-    // http://anglebug.com/3831
-    ANGLE_SKIP_TEST_IF(IsNVIDIA() && IsOpenGL());
-
    // Fails on Mac on Intel and AMD: http://anglebug.com/3842
    ANGLE_SKIP_TEST_IF(IsOSX() && IsOpenGL() && (IsIntel() || IsAMD()));

@@ -7119,13 +7116,13 @@ out vec4 outColor;

 struct S
 {
-    mat2x3 m2[2];
+    mat2x3 m2[3];
 };

 layout(std140, column_major) uniform Ubo
 {
    mat4 m1;
-    layout(row_major) S s[3];
+    layout(row_major) S s[2];
 } ubo;

 #define EXPECT(result, expression, value) if ((expression) != value) { result = false; }