Bump implementation max textures/images limit to 96.

We need the higher limit for tessellation shaders and ES 3.2. Unfortunately this means we are no longer using a packed 64-bit bitset for the active textures and images. We fallback to using std::bitset. Also keeps the 64 texture limit if tessellation is not available. The higher limits was causing timeouts in WebGL tests. Bug: angleproject:3572 Change-Id: I1953955600b56d7c66178bd610de53453151dc8f Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2586996 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Tim Van Patten <timvp@google.com>

Bump implementation max textures/images limit to 96.
b91afcfd · Jamie Madill · Commit Bot · c2a620b0 · b91afcfd · b91afcfd
Commit b91afcfd authored Dec 11, 2020 by Jamie Madill Committed by Commit Bot Dec 23, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 4 deletions

Constants.h src/libANGLE/Constants.h +6 -2

Context.cpp src/libANGLE/Context.cpp +11 -2

No files found.
--- a/src/libANGLE/Constants.h
+++ b/src/libANGLE/Constants.h
@@ -67,9 +67,13 @@ enum
    // 1+log2 of max of MAX_*_TEXTURE_SIZE
    IMPLEMENTATION_MAX_TEXTURE_LEVELS = 16,
-    // Limit active textures so we can use fast bitsets.
    IMPLEMENTATION_MAX_SHADER_TEXTURES = 32,
-    IMPLEMENTATION_MAX_ACTIVE_TEXTURES = IMPLEMENTATION_MAX_SHADER_TEXTURES * 2,
+    // In ES 3.1 and below, the limit for active textures is 64.
+    IMPLEMENTATION_MAX_ES31_ACTIVE_TEXTURES = 64,
+    // In ES 3.2 we need to support a minimum of 96 maximum textures.
+    IMPLEMENTATION_MAX_ACTIVE_TEXTURES = 96,
    IMPLEMENTATION_MAX_IMAGE_UNITS     = IMPLEMENTATION_MAX_ACTIVE_TEXTURES,
    // Maximum number of slots allocated for atomic counter buffers.

--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -3501,8 +3501,17 @@ void Context::initCaps()
    ANGLE_LIMIT_CAP(mState.mCaps.maxTransformFeedbackSeparateComponents,
                    IMPLEMENTATION_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS);
-    // Limit textures as well, so we can use fast bitsets with texture bindings.
+    if (getClientVersion() < ES_3_2)
-    ANGLE_LIMIT_CAP(mState.mCaps.maxCombinedTextureImageUnits, IMPLEMENTATION_MAX_ACTIVE_TEXTURES);
+    {
+        ANGLE_LIMIT_CAP(mState.mCaps.maxCombinedTextureImageUnits,
+                        IMPLEMENTATION_MAX_ES31_ACTIVE_TEXTURES);
+    }
+    else
+    {
+        ANGLE_LIMIT_CAP(mState.mCaps.maxCombinedTextureImageUnits,
+                        IMPLEMENTATION_MAX_ACTIVE_TEXTURES);
+    }
    for (ShaderType shaderType : AllShaderTypes())
    {
        ANGLE_LIMIT_CAP(mState.mCaps.maxShaderTextureImageUnits[shaderType],