GL: Respect TexSubImage upload limits for robust init

The chunked_texture_upload splits texture uploads for glTexSubImage calls but ANGLE uses glTexSubImage internally for robust resource initialization. Also chunk those uploads. Bug: chromium:1181068 Change-Id: Ia6eaac8117173946630f420b396cbc54c163b7ce Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2961230Reviewed-by: Kenneth Russell <kbr@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

GL: Respect TexSubImage upload limits for robust init
8333d061 · Geoff Lang · Angle LUCI CQ · c40262dc · 8333d061 · 8333d061
Commit 8333d061 authored Jun 14, 2021 by Geoff Lang Committed by Angle LUCI CQ Jun 15, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 9 deletions

FeaturesGL.h include/platform/FeaturesGL.h +2 -1

TextureGL.cpp src/libANGLE/renderer/gl/TextureGL.cpp +19 -8

No files found.
--- a/include/platform/FeaturesGL.h
+++ b/include/platform/FeaturesGL.h
@@ -557,7 +557,8 @@ struct FeaturesGL : FeatureSetBase
    // Mac OpenGL drivers often hang when calling glTexSubImage with >120kb of data. Instead, upload
    // the data in <120kb chunks.
-    Feature uploadTextureDataInChunks = {
+    static constexpr const size_t kUploadTextureDataInChunksUploadSize = (120 * 1024) - 1;
+    Feature uploadTextureDataInChunks                                  = {
        "chunked_texture_upload", FeatureCategory::OpenGLWorkarounds,
        "Upload texture data in <120kb chunks to work around Mac driver hangs and crashes.",
        &members, "http://crbug.com/1181068"};

--- a/src/libANGLE/renderer/gl/TextureGL.cpp
+++ b/src/libANGLE/renderer/gl/TextureGL.cpp
@@ -358,9 +358,9 @@ angle::Result TextureGL::setSubImage(const gl::Context *context,
    if (features.uploadTextureDataInChunks.enabled)
    {
-        constexpr const size_t kMaxUploadChunkSize = (120 * 1024) - 1;
+        return setSubImageRowByRowWorkaround(
-        return setSubImageRowByRowWorkaround(context, target, level, area, format, type, unpack,
+            context, target, level, area, format, type, unpack, unpackBuffer,
-                                             unpackBuffer, kMaxUploadChunkSize, pixels);
+            angle::FeaturesGL::kUploadTextureDataInChunksUploadSize, pixels);
    }
    if (nativegl::UseTexImage2D(getType()))
@@ -2077,11 +2077,22 @@ angle::Result TextureGL::initializeContents(const gl::Context *context,
        if (nativegl::UseTexImage2D(getType()))
        {
-            ANGLE_GL_TRY(context,
+            if (features.uploadTextureDataInChunks.enabled)
-                         functions->texSubImage2D(ToGLenum(imageIndex.getTarget()),
+            {
-                                                  imageIndex.getLevelIndex(), 0, 0, desc.size.width,
+                gl::Box area(0, 0, 0, desc.size.width, desc.size.height, 1);
-                                                  desc.size.height, nativeSubImageFormat.format,
+                ANGLE_TRY(setSubImageRowByRowWorkaround(
-                                                  nativeSubImageFormat.type, zero->data()));
+                    context, imageIndex.getTarget(), imageIndex.getLevelIndex(), area,
+                    nativeSubImageFormat.format, nativeSubImageFormat.type, unpackState, nullptr,
+                    angle::FeaturesGL::kUploadTextureDataInChunksUploadSize, zero->data()));
+            }
+            else
+            {
+                ANGLE_GL_TRY(context,
+                             functions->texSubImage2D(
+                                 ToGLenum(imageIndex.getTarget()), imageIndex.getLevelIndex(), 0, 0,
+                                 desc.size.width, desc.size.height, nativeSubImageFormat.format,
+                                 nativeSubImageFormat.type, zero->data()));
+            }
        }
        else
        {