webgl: clip image write based on texture size (#2234)

visgl · Aug 30, 2024 · 1344d3e · 1344d3e
1 parent 61c927c
commit 1344d3e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/modules/core/test/adapter/resources/texture.spec.ts b/modules/core/test/adapter/resources/texture.spec.ts
@@ -329,6 +329,22 @@ test('Texture#copyExternalImage', async t => {
           `${device.info.type} Pixels were set correctly (sub image)`
         );
       }
+
+      // Subimage copy (smaller canvas)
+      canvas.width = 1;
+      canvas.height = 1;
+      ctx.fillStyle = '#00FF00';
+      ctx.fillRect(0, 0, 1, 1);
+
+      texture.copyExternalImage({image: canvas, x: 1});
+
+      if (device.info.type === 'webgl') {
+        t.deepEquals(
+          device.readPixelsToArrayWebGL(texture),
+          new Uint8Array([255, 0, 0, 255, 0, 255, 0, 255]),
+          `${device.info.type} Pixels were set correctly (sub image small canvas)`
+        );
+      }
     }
 
     if (device.info.type !== 'webgl') {

diff --git a/modules/webgl/src/adapter/resources/webgl-texture.ts b/modules/webgl/src/adapter/resources/webgl-texture.ts
@@ -243,8 +243,8 @@ export class WEBGLTexture extends Texture {
     const {dimension, glTarget, glFormat, glInternalFormat, glType} = this;
 
     // WebGL will error if we try to copy outside the bounds of the texture
-    width = Math.min(width, size.width - x);
-    height = Math.min(height, size.height - y);
+    width = Math.min(width, this.width - x);
+    height = Math.min(height, this.height - y);
 
     if (options.sourceX || options.sourceY) {
       // requires copyTexSubImage2D from a framebuffer'