GL: Make sure primitive restart emulation is disabled below GL 3.1

If the GL driver version is below 3.1, we cannot set the primitive restart fixed index (ES3 wont be supported anyway). Make sure the feature is disabled. Speculative fix for crbug.com/1073020 BUG=chromium:1073020 BUG=angleproject:3997 Change-Id: I67756b377aa951da2e70c26f7db978ede9010586 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2159289 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>

GL: Make sure primitive restart emulation is disabled below GL 3.1
9dc322d7 · Geoff Lang · Commit Bot · 03c18fbd · 9dc322d7
Commit 9dc322d7 authored Apr 21, 2020 by Geoff Lang Committed by Commit Bot Apr 21, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

renderergl_utils.cpp src/libANGLE/renderer/gl/renderergl_utils.cpp +6 -4

No files found.
--- a/src/libANGLE/renderer/gl/renderergl_utils.cpp
+++ b/src/libANGLE/renderer/gl/renderergl_utils.cpp
@@ -1657,11 +1657,13 @@ void InitializeFeatures(const FunctionsGL *functions, angle::FeaturesGL *feature
    ANGLE_FEATURE_CONDITION(features, unfoldShortCircuits, IsApple());
+    ANGLE_FEATURE_CONDITION(features, emulatePrimitiveRestartFixedIndex,
+                            functions->standard == STANDARD_GL_DESKTOP &&
+                                functions->isAtLeastGL(gl::Version(3, 1)) &&
+                                !functions->isAtLeastGL(gl::Version(4, 3)));
    ANGLE_FEATURE_CONDITION(
-        features, emulatePrimitiveRestartFixedIndex,
+        features, setPrimitiveRestartFixedIndexForDrawArrays,
-        functions->standard == STANDARD_GL_DESKTOP && !functions->isAtLeastGL(gl::Version(4, 3)));
+        features->emulatePrimitiveRestartFixedIndex.enabled && IsApple() && isIntel);
-    ANGLE_FEATURE_CONDITION(features, setPrimitiveRestartFixedIndexForDrawArrays,
-                            IsApple() && isIntel);
    ANGLE_FEATURE_CONDITION(features, removeDynamicIndexingOfSwizzledVector,
                            IsApple() || IsAndroid() || IsWindows());