Merge pull request #20272 from takahirox/FixBindGroupRefresh

WebGPURenderer: Detect needsBindGroupRefresh more properly
mrdoob · Sep 6, 2020 · 5c302a5 · 5c302a5
2 parents 329cb62 + 9308105
commit 5c302a5
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/examples/jsm/renderers/webgpu/WebGPUBindings.js b/examples/jsm/renderers/webgpu/WebGPUBindings.js
@@ -115,11 +115,13 @@ class WebGPUBindings {
 				const material = object.material;
 				const texture = material[ binding.name ];
 
-				needsBindGroupRefresh = this.textures.updateSampler( texture );
+				this.textures.updateSampler( texture );
+				const samplerGPU = this.textures.getSampler( texture );
 
-				if ( needsBindGroupRefresh === true ) {
+				if ( binding.samplerGPU !== samplerGPU ) {
 
-					binding.samplerGPU = this.textures.getSampler( texture );
+					binding.samplerGPU = samplerGPU;
+					needsBindGroupRefresh = true;
 
 				}
 
@@ -128,11 +130,13 @@ class WebGPUBindings {
 				const material = object.material;
 				const texture = material[ binding.name ];
 
-				needsBindGroupRefresh = this.textures.updateTexture( texture );
+				this.textures.updateTexture( texture );
+				const textureGPU = this.textures.getTextureGPU( texture );
 
-				if ( needsBindGroupRefresh === true ) {
+				if ( binding.textureGPU !== textureGPU ) {
 
-					binding.textureGPU = this.textures.getTextureGPU( texture );
+					binding.textureGPU = textureGPU;
+					needsBindGroupRefresh = true;
 
 				}