rework cache key

Author: aardgoose

src/renderers/common/ClippingContext.js

@@ -4,15 +4,14 @@ import { Vector4 } from '../../math/Vector4.js';
 
 const _plane = /*@__PURE__*/ new Plane();
 
-let _clippingContextVersion = 0;
-
 class ClippingContext {
 
 	constructor( parentContext = null ) {
 
-		this.version = ++ _clippingContextVersion;
+		this.version = 0;
 
 		this.clipIntersection = null;
+		this.cacheKey = '';
 
 
 		if ( parentContext === null ) {
@@ -36,7 +35,7 @@ class ClippingContext {
 
 		}
 
-		this.parentVersion = 0;
+		this.parentVersion = null;
 
 	}
 
@@ -131,7 +130,12 @@ class ClippingContext {
 
 		this.projectPlanes( srcClippingPlanes, dstClippingPlanes, offset );
 
-		if ( update ) this.version = _clippingContextVersion ++;
+		if ( update ) {
+
+			this.version ++;
+			this.cacheKey = `${ this.intersectionPlanes.length }:${ this.unionPlanes.length }`;
+
+		}
 
 	}
 

src/renderers/common/RenderObject.js

@@ -62,7 +62,7 @@ export default class RenderObject {
 		this.vertexBuffers = null;
 
 		this.clippingContext = clippingContext;
-		this.clippingContextVersion = clippingContext !== null ? clippingContext.version : 0;
+		this.clippingContextCacheKey = clippingContext !== null ? clippingContext.cacheKey : '';
 
 		this.initialNodesCacheKey = this.getDynamicCacheKey();
 		this.initialCacheKey = this.getCacheKey();
@@ -92,9 +92,9 @@ export default class RenderObject {
 
 	get clippingNeedsUpdate() {
 
-		if ( this.clippingContext === null || this.clippingContext.version === this.clippingContextVersion ) return false;
+		if ( this.clippingContext === null || this.clippingContext.cacheKey === this.clippingContextCacheKey ) return false;
 
-		this.clippingContextVersion = this.clippingContext.version;
+		this.clippingContextCacheKey = this.clippingContext.cacheKey;
 
 		return true;
 
@@ -214,7 +214,7 @@ export default class RenderObject {
 
 		}
 
-		cacheKey += this.clippingContextVersion + ',';
+		cacheKey += this.clippingContextCacheKey + ',';
 
 		if ( object.skeleton ) {
 

src/renderers/webgpu/WebGPUBackend.js

@@ -1026,7 +1026,7 @@ class WebGPUBackend extends Backend {
 			data.sampleCount !== sampleCount || data.colorSpace !== colorSpace ||
 			data.colorFormat !== colorFormat || data.depthStencilFormat !== depthStencilFormat ||
 			data.primitiveTopology !== primitiveTopology ||
-			data.clippingContextVersion !== renderObject.clippingContextVersion
+			data.clippingContextCacheKey !== renderObject.clippingContextCacheKey
 		) {
 
 			data.material = material; data.materialVersion = material.version;
@@ -1044,7 +1044,7 @@ class WebGPUBackend extends Backend {
 			data.colorFormat = colorFormat;
 			data.depthStencilFormat = depthStencilFormat;
 			data.primitiveTopology = primitiveTopology;
-			data.clippingContextVersion = renderObject.clippingContextVersion;
+			data.clippingContextCacheKey = renderObject.clippingContextCacheKey;
 
 			needsUpdate = true;
 
@@ -1074,7 +1074,7 @@ class WebGPUBackend extends Backend {
 			utils.getSampleCountRenderContext( renderContext ),
 			utils.getCurrentColorSpace( renderContext ), utils.getCurrentColorFormat( renderContext ), utils.getCurrentDepthStencilFormat( renderContext ),
 			utils.getPrimitiveTopology( object, material ),
-			renderObject.clippingContextVersion
+			renderObject.clippingContextCacheKey
 		].join();
 
 	}