Turn on clampArrayAccess globally but off for compute shaders

out-of-bounds-uniform-array-access.html could fail on Linux Nvidia OpenGL even if GL_KHR_robust_buffer_access_behavior is available. Turning clampArrayAccess on globally but turn it off for Compute Shader, which is not used by WebGL so should be okay. FYI: The failures when turning this on globally are all in compute shaders. One could be fixed by using int cast instead of float for the clamp modifier. The other is due to array.length() couldn't return correct result for array in SSBO. Bug: chromium:1042252 Change-Id: Ic6f7adae4600d35207646881b18990a0c25a889a Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2020463 Commit-Queue: Shrek Shao <shrekshao@google.com> Reviewed-by: Kenneth Russell <kbr@chromium.org>

Turn on clampArrayAccess globally but off for compute shaders
571ceb5f · shrekshao · Commit Bot · cc414d57 · 571ceb5f · 571ceb5f
Commit 571ceb5f authored Jan 24, 2020 by shrekshao Committed by Commit Bot Jan 28, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Compiler.cpp src/compiler/translator/Compiler.cpp +1 -1

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

No files found.
--- a/src/compiler/translator/Compiler.cpp
+++ b/src/compiler/translator/Compiler.cpp
@@ -617,7 +617,7 @@ bool TCompiler::checkAndSimplifyAST(TIntermBlock *root,
    }
    // Clamping uniform array bounds needs to happen after validateLimitations pass.
-    if (compileOptions & SH_CLAMP_INDIRECT_ARRAY_BOUNDS)
+    if (compileOptions & SH_CLAMP_INDIRECT_ARRAY_BOUNDS && mShaderType != GL_COMPUTE_SHADER)
    {
        mArrayBoundsClamper.MarkIndirectArrayBoundsForClamping(root);
    }

--- a/src/libANGLE/renderer/gl/renderergl_utils.cpp
+++ b/src/libANGLE/renderer/gl/renderergl_utils.cpp
@@ -1599,9 +1599,9 @@ void InitializeFeatures(const FunctionsGL *functions, angle::FeaturesGL *feature
    // The WebGL conformance/uniforms/out-of-bounds-uniform-array-access test has been seen to fail
    // on AMD and Android devices.
-    ANGLE_FEATURE_CONDITION(
+    // This test is also flaky on Linux Nvidia. So we just turn it on everywhere and don't rely on
-        features, clampArrayAccess,
+    // driver since security is important.
-        IsAndroid() || isAMD || !functions->hasExtension("GL_KHR_robust_buffer_access_behavior"));
+    ANGLE_FEATURE_CONDITION(features, clampArrayAccess, true);
    ANGLE_FEATURE_CONDITION(features, resetTexImage2DBaseLevel,
                            IsApple() && isIntel && GetMacOSVersion() >= OSVersion(10, 12, 4));