Disable rewriteRowMajorMatrices workaround.

It's causing flaky crashes in tests. Leave the revised code in place so it's easier to debug. Disable test which required the workaround. Bug: angleproject:2273 Bug: angleproject:3843 Change-Id: Iebb682bd3c6282031cc57eda5d3d4d5636be7294 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2033870 Commit-Queue: Kenneth Russell <kbr@chromium.org> Reviewed-by: Kenneth Russell <kbr@chromium.org>

Disable rewriteRowMajorMatrices workaround.
07795d47 · Kenneth Russell · Commit Bot · a8c7e10f · 07795d47 · 07795d47
Commit 07795d47 authored Jan 31, 2020 by Kenneth Russell Committed by Commit Bot Feb 01, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

renderergl_utils.cpp src/libANGLE/renderer/gl/renderergl_utils.cpp +3 -1

UniformBufferTest.cpp src/tests/gl_tests/UniformBufferTest.cpp +2 -2

No files found.
--- a/src/libANGLE/renderer/gl/renderergl_utils.cpp
+++ b/src/libANGLE/renderer/gl/renderergl_utils.cpp
@@ -1646,7 +1646,9 @@ void InitializeFeatures(const FunctionsGL *functions, angle::FeaturesGL *feature
    // anglebug.com/2273
    // Seems to affect both Intel and AMD GPUs. Enable workaround for all GPUs on macOS.
    ANGLE_FEATURE_CONDITION(features, rewriteRowMajorMatrices,
-                            IsApple() && functions->standard == STANDARD_GL_DESKTOP);
+                            // IsApple() && functions->standard == STANDARD_GL_DESKTOP);
+                            // TODO(anglebug.com/2273): diagnose crashes with this workaround.
+                            false);
 }
 void InitializeFrontendFeatures(const FunctionsGL *functions, angle::FrontendFeatures *features)

--- a/src/tests/gl_tests/UniformBufferTest.cpp
+++ b/src/tests/gl_tests/UniformBufferTest.cpp
@@ -2154,8 +2154,8 @@ TEST_P(UniformBufferTest, UniformBlocksInDiffProgramShareUniformBuffer)
 // Test a uniform block where an array of row-major matrices is dynamically indexed.
 TEST_P(UniformBufferTest, Std140UniformBlockWithDynamicallyIndexedRowMajorArray)
 {
-    // http://anglebug.com/3837
+    // http://anglebug.com/3837 , http://anglebug.com/2273
-    ANGLE_SKIP_TEST_IF(IsLinux() && IsIntel() && IsOpenGL());
+    ANGLE_SKIP_TEST_IF((IsLinux() && IsIntel() && IsOpenGL()) || IsOSX());
    constexpr char kFS[] =
        R"(#version 300 es