@@ -182,6 +182,9 @@ bool BlitCopyBufferToTextureCommandGLES::Encode(
       texture_target = GL_TEXTURE_CUBE_MAP_POSITIVE_X + slice;
       break;
     case TextureType::kTexture2DArray:
+      // TODO(bdero): Surface array-texture support up to the Flutter GPU Dart
+      // API so callers get a clear error at texture creation instead of a
+      // failed upload on contexts without array support.
       if (!reactor.GetProcTable().GetCapabilities()->SupportsTextureArrays()) {
         VALIDATION_LOG
             << "2D array textures are not supported on this context.";
 
@@ -10,10 +10,10 @@
 #include "flutter/testing/testing.h"
 #include "gtest/gtest.h"
 #include "impeller/base/validation.h"
-#include "impeller/core/formats.h"
-#include "impeller/core/texture_descriptor.h"
 #include "impeller/core/buffer_view.h"
+#include "impeller/core/formats.h"
 #include "impeller/core/range.h"
+#include "impeller/core/texture_descriptor.h"
 #include "impeller/renderer/backend/gles/handle_gles.h"
 #include "impeller/renderer/backend/gles/proc_table_gles.h"
 #include "impeller/renderer/backend/gles/test/mock_gles.h"
@@ -204,8 +204,10 @@ TEST_P(TextureGLESTest, CanCreateAndUpload2DArrayTexture) {
                                    /*mip_level=*/0, slice));
   }
   EXPECT_TRUE(blit_pass->EncodeCommands());
-  EXPECT_TRUE(
-      GetContext()->GetCommandQueue()->Submit({std::move(command_buffer)}).ok());
+  EXPECT_TRUE(GetContext()
+                  ->GetCommandQueue()
+                  ->Submit({std::move(command_buffer)})
+                  .ok());
   EXPECT_TRUE(context_gles.GetReactor()->React());
 }
 
 
@@ -5,6 +5,7 @@
 #include "flutter/lib/gpu/texture.h"
 
 #include <cstring>
+#include <limits>
 
 #include "flutter/lib/gpu/formats.h"
 #include "flutter/lib/ui/painting/image.h"
@@ -219,6 +220,7 @@ bool InternalFlutterGpu_Texture_Initialize(Dart_Handle wrapper,
   if (layer_count < 1) {
     return false;
   }
+  FML_DCHECK(layer_count <= std::numeric_limits<uint16_t>::max());
   impeller::TextureDescriptor desc;
   desc.storage_mode = flutter::gpu::ToImpellerStorageMode(storage_mode);
   desc.size = {width, height};