WebGPURenderer: WebGL fallback - fix scissor with MSAA (#29148)

* scissor msaa resolve and invalidation * update screenshot * exclude screenshot from tests --------- Co-authored-by: aardgoose <[email protected]>
mrdoob · Aug 16, 2024 · 769a82d · 769a82d
1 parent 17d60f6
commit 769a82d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/examples/screenshots/webgpu_textures_anisotropy.jpg b/examples/screenshots/webgpu_textures_anisotropy.jpg
diff --git a/examples/webgpu_textures_anisotropy.html b/examples/webgpu_textures_anisotropy.html
@@ -228,7 +228,7 @@
 				renderer.setScissor( SCREEN_WIDTH / 2, 0, SCREEN_WIDTH / 2 - 2, SCREEN_HEIGHT );
 				renderer.render( scene2, camera );
 
-				// renderer.setScissorTest( false );
+				renderer.setScissorTest( false );
 
 			}
 

diff --git a/src/renderers/webgl-fallback/WebGLBackend.js b/src/renderers/webgl-fallback/WebGLBackend.js
@@ -274,9 +274,20 @@ class WebGLBackend extends Backend {
 
 					// TODO Add support for MRT
 
-					gl.blitFramebuffer( 0, 0, renderContext.width, renderContext.height, 0, 0, renderContext.width, renderContext.height, mask, gl.NEAREST );
+					if ( renderContext.scissor ) {
+
+						const { x, y, width, height } = renderContext.scissorValue;
+
+						gl.blitFramebuffer( x, y, x + width, y + height, x, y, x + width, y + height, mask, gl.NEAREST );
+						gl.invalidateSubFramebuffer( gl.READ_FRAMEBUFFER, renderTargetContextData.invalidationArray, x, y, width, height );
+
+					} else {
+
+						gl.blitFramebuffer( 0, 0, renderContext.width, renderContext.height, 0, 0, renderContext.width, renderContext.height, mask, gl.NEAREST );
+						gl.invalidateFramebuffer( gl.READ_FRAMEBUFFER, renderTargetContextData.invalidationArray );
+
+					}
 
-					gl.invalidateFramebuffer( gl.READ_FRAMEBUFFER, renderTargetContextData.invalidationArray );
 
 				}
 

diff --git a/test/e2e/puppeteer.js b/test/e2e/puppeteer.js
@@ -149,6 +149,7 @@ const exceptionList = [
 	'webgpu_tsl_vfx_flames',
 	'webgpu_tsl_halftone',
 	'webgpu_tsl_vfx_tornado',
+	'webgpu_textures_anisotropy',
 
 	// WebGPU idleTime and parseTime too low
 	'webgpu_compute_particles',