WebGPURenderer: Add copyTextureToTexture support (#864)

* WebGPURenderer: Add copyTextureToTexture support * Add examples * Update patch * Remove examples * Format
three-types · Mar 23, 2024 · aa83cbd · aa83cbd
1 parent 5cf9c0a
commit aa83cbd
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/examples-testing/changes.patch b/examples-testing/changes.patch
@@ -13999,6 +13999,33 @@ index ca0ae9e..2125232 100644
      const windowHalfX = window.innerWidth / 2;
      const windowHalfY = window.innerHeight / 2;
 
+diff --git a/examples-testing/examples/webgpu_materials_texture_partialupdate.ts b/examples-testing/examples/webgpu_materials_texture_partialupdate.ts
+index 3fb91ed..67f2f7b 100644
+--- a/examples-testing/examples/webgpu_materials_texture_partialupdate.ts
++++ b/examples-testing/examples/webgpu_materials_texture_partialupdate.ts
+@@ -1,7 +1,12 @@
+ import * as THREE from 'three';
+ import WebGPURenderer from 'three/addons/renderers/webgpu/WebGPURenderer.js';
+
+-let camera, scene, renderer, clock, dataTexture, diffuseMap;
++let camera: THREE.PerspectiveCamera,
++    scene: THREE.Scene,
++    renderer: WebGPURenderer,
++    clock: THREE.Clock,
++    dataTexture: THREE.DataTexture,
++    diffuseMap: THREE.Texture;
+
+ let last = 0;
+ const position = new THREE.Vector2();
+@@ -79,7 +84,7 @@ async function animate() {
+     }
+ }
+
+-function updateDataTexture(texture) {
++function updateDataTexture(texture: THREE.DataTexture) {
+     const size = texture.image.width * texture.image.height;
+     const data = texture.image.data;
+
 diff --git a/examples-testing/examples/webgpu_materials_video.ts b/examples-testing/examples/webgpu_materials_video.ts
 index fbbabfc..a1a82bd 100644
 --- a/examples-testing/examples/webgpu_materials_video.ts
@@ -14496,7 +14523,7 @@ index b659652..06e3224 100644
  //
 
 diff --git a/examples-testing/examples/webxr_vr_sandbox.ts b/examples-testing/examples/webxr_vr_sandbox.ts
-index d8212a4..3302cb5 100644
+index 27c8572..0e78647 100644
 --- a/examples-testing/examples/webxr_vr_sandbox.ts
 +++ b/examples-testing/examples/webxr_vr_sandbox.ts
 @@ -12,9 +12,9 @@ import { XRControllerModelFactory } from 'three/addons/webxr/XRControllerModelFa
@@ -14512,7 +14539,7 @@ index d8212a4..3302cb5 100644
 
  const parameters = {
      radius: 0.6,
-@@ -200,7 +200,7 @@ function animate() {
+@@ -199,7 +199,7 @@ function animate() {
 
  function render() {
      const time = performance.now() * 0.0002;
@@ -14521,7 +14548,7 @@ index d8212a4..3302cb5 100644
      torus.rotation.x = time * 0.4;
      torus.rotation.y = time;
 
-@@ -208,5 +208,9 @@ function render() {
+@@ -207,5 +207,9 @@ function render() {
      stats.update();
 
      // Canvas elements doesn't trigger DOM updates, so we have to update the texture

diff --git a/three.js b/three.js
diff --git a/types/three/examples/jsm/renderers/common/Renderer.d.ts b/types/three/examples/jsm/renderers/common/Renderer.d.ts
@@ -12,6 +12,7 @@ import {
     RenderTarget,
     Scene,
     ShadowMapType,
+    Texture,
     ToneMapping,
     Vector2,
     Vector4,
@@ -268,6 +269,8 @@ export default class Renderer {
 
     copyFramebufferToTexture(framebufferTexture: FramebufferTexture): void;
 
+    copyTextureToTexture(position: Vector2, srcTexture: Texture, dstTexture: Texture, level?: number): void;
+
     readRenderTargetPixelsAsync(
         renderTarget: RenderTarget,
         x: number,
+12 −3		build/three.cjs
+12 −3		build/three.module.js
+1 −1		build/three.module.min.js
+3 −3		editor/js/Sidebar.Project.Image.js
+1 −1		editor/js/Sidebar.Script.js
+1 −0		examples/files.json
+694 −496		examples/jsm/libs/fflate.module.js
+6 −0		examples/jsm/loaders/GLTFLoader.js
+10 −0		examples/jsm/renderers/common/Renderer.js
+6 −0		examples/jsm/renderers/webgl/WebGLBackend.js
+42 −0		examples/jsm/renderers/webgl/utils/WebGLTextureUtils.js
+32 −1		examples/jsm/renderers/webgpu/WebGPUBackend.js
+ −		examples/screenshots/webgpu_materials_texture_partialupdate.jpg
+ −		examples/screenshots/webxr_vr_sandbox.jpg
+150 −0		examples/webgpu_materials_texture_partialupdate.html
+3 −4		examples/webxr_vr_sandbox.html
+4 −10		manual/en/post-processing.html
+2 −6		manual/examples/postprocessing-gui.html
+1 −3		manual/examples/postprocessing.html
+4 −10		manual/ja/post-processing.html
+4 −10		manual/ko/post-processing.html
+4 −10		manual/zh/post-processing.html
+12 −22		src/renderers/WebGLRenderer.js
+10 −1		src/renderers/shaders/UniformsUtils.js
+3 −1		src/renderers/webgl/WebGLRenderStates.js