Remove uniforms

Author: Popov72

packages/dev/core/src/Engines/WebGPU/webgpuDrawContext.ts

@@ -156,27 +156,7 @@ export class WebGPUDrawContext implements IDrawContext {
         }
 
         if (bufferNames.indexOf("indices") !== -1) {
-            if (!useVertexPulling) {
-                this.setBuffer("indices", null);
-            } else {
-                let is32bits = false;
-                if (indexBuffer) {
-                    this.setBuffer("indices", indexBuffer as WebGPUDataBuffer);
-                    is32bits = indexBuffer.is32Bits;
-                } else {
-                    // If no index buffer exists but the vertex shader uses the "indices" buffer, we need
-                    // to bind a dummy index buffer (of size 4 to avoid WebGPU errors). Then we'll set the
-                    // uniform to indicate that indices aren't used by the mesh.
-                    this.setBuffer("indices", this._dummyIndexBuffer);
-                }
-                // Set uniforms to indicate that the index buffer is used and whether it is 32-bit or 16-bit.
-                if (webgpuPipelineContext.uniformBuffer?.has("hasIndices")) {
-                    webgpuPipelineContext.uniformBuffer.updateInt("hasIndices", indexBuffer ? 1 : 0);
-                }
-                if (webgpuPipelineContext.uniformBuffer?.has("indicesAre32bit")) {
-                    webgpuPipelineContext.uniformBuffer?.updateInt("indicesAre32bit", is32bits ? 1 : 0);
-                }
-            }
+            this.setBuffer("indices", !useVertexPulling ? null : ((indexBuffer as WebGPUDataBuffer) ?? this._dummyIndexBuffer));
         }
     }
 

packages/dev/core/src/Engines/thinEngine.ts

@@ -210,8 +210,6 @@ export class ThinEngine extends AbstractEngine {
 
     // Cache
 
-    /** @internal */
-    public _currentMaterialContext: IMaterialContext;
     /** @internal */
     protected _currentProgram: Nullable<WebGLProgram>;
     private _vertexAttribArraysEnabled: boolean[] = [];

packages/dev/core/src/Materials/PBR/pbrBaseMaterial.ts

@@ -1276,7 +1276,7 @@ export abstract class PBRBaseMaterial extends PushMaterial {
 
         const previousEffect = subMesh.effect;
         const lightDisposed = defines._areLightsDisposed;
-        let effect = this._prepareEffect(mesh, defines, this.onCompiled, this.onError, useInstances, null, subMesh.getRenderingMesh().hasThinInstances);
+        let effect = this._prepareEffect(mesh, subMesh.getRenderingMesh(), defines, this.onCompiled, this.onError, useInstances, null);
 
         let forceWasNotReadyPreviously = false;
 
@@ -1332,14 +1332,14 @@ export abstract class PBRBaseMaterial extends PushMaterial {
 
     private _prepareEffect(
         mesh: AbstractMesh,
+        renderingMesh: AbstractMesh,
         defines: PBRMaterialDefines,
         onCompiled: Nullable<(effect: Effect) => void> = null,
         onError: Nullable<(effect: Effect, errors: string) => void> = null,
         useInstances: Nullable<boolean> = null,
-        useClipPlane: Nullable<boolean> = null,
-        useThinInstances: boolean
+        useClipPlane: Nullable<boolean> = null
     ): Nullable<Effect> {
-        this._prepareDefines(mesh, defines, useInstances, useClipPlane, useThinInstances);
+        this._prepareDefines(mesh, renderingMesh, defines, useInstances, useClipPlane);
 
         if (!defines.isDirty) {
             return null;
@@ -1647,11 +1647,13 @@ export abstract class PBRBaseMaterial extends PushMaterial {
 
     private _prepareDefines(
         mesh: AbstractMesh,
+        renderingMesh: AbstractMesh,
         defines: PBRMaterialDefines,
         useInstances: Nullable<boolean> = null,
-        useClipPlane: Nullable<boolean> = null,
-        useThinInstances: boolean = false
+        useClipPlane: Nullable<boolean> = null
     ): void {
+        const useThinInstances = renderingMesh.hasThinInstances;
+
         const scene = this.getScene();
         const engine = scene.getEngine();
 
@@ -2007,7 +2009,8 @@ export abstract class PBRBaseMaterial extends PushMaterial {
                 this.needAlphaTestingForMesh(mesh),
                 defines,
                 this._applyDecalMapAfterDetailMap,
-                this._useVertexPulling
+                this._useVertexPulling,
+                renderingMesh
             );
             defines.UNLIT = this._unlit || ((this.pointsCloud || this.wireframe) && !mesh.isVerticesDataPresent(VertexBuffer.NormalKind));
             defines.DEBUGMODE = this._debugMode;
@@ -2051,7 +2054,7 @@ export abstract class PBRBaseMaterial extends PushMaterial {
                 return;
             }
             const defines = new PBRMaterialDefines(this._eventInfo.defineNames);
-            const effect = this._prepareEffect(mesh, defines, undefined, undefined, localOptions.useInstances, localOptions.clipPlane, mesh.hasThinInstances)!;
+            const effect = this._prepareEffect(mesh, mesh, defines, undefined, undefined, localOptions.useInstances, localOptions.clipPlane)!;
             if (this._onEffectCreatedObservable) {
                 onCreatedEffectParameters.effect = effect;
                 onCreatedEffectParameters.subMesh = null;

packages/dev/core/src/Materials/materialHelper.functions.ts

@@ -500,6 +500,7 @@ export function GetFogState(mesh: AbstractMesh, scene: Scene) {
  * @param defines defines the current list of defines
  * @param applyDecalAfterDetail Defines if the decal is applied after or before the detail
  * @param useVertexPulling Defines if vertex pulling is used
+ * @param renderingMesh The mesh used for rendering
  */
 export function PrepareDefinesForMisc(
     mesh: AbstractMesh,
@@ -510,7 +511,8 @@ export function PrepareDefinesForMisc(
     alphaTest: boolean,
     defines: any,
     applyDecalAfterDetail: boolean = false,
-    useVertexPulling: boolean = false
+    useVertexPulling: boolean = false,
+    renderingMesh?: AbstractMesh
 ): void {
     if (defines._areMiscDirty) {
         defines["LOGARITHMICDEPTH"] = useLogarithmicDepth;
@@ -520,6 +522,11 @@ export function PrepareDefinesForMisc(
         defines["ALPHATEST"] = alphaTest;
         defines["DECAL_AFTER_DETAIL"] = applyDecalAfterDetail;
         defines["USE_VERTEX_PULLING"] = useVertexPulling;
+
+        const indexBuffer = renderingMesh?.geometry?.getIndexBuffer();
+
+        defines["VERTEX_PULLING_USE_INDEX_BUFFER"] = !!indexBuffer;
+        defines["VERTEX_PULLING_INDEX_BUFFER_32BITS"] = indexBuffer ? indexBuffer.is32Bits : false;
     }
 }
 

packages/dev/core/src/Materials/shaderMaterial.ts

@@ -880,8 +880,17 @@ export class ShaderMaterial extends PushMaterial {
             shaderName = this.customShaderNameResolve(this.name, uniforms, uniformBuffers, samplers, defines, attribs);
         }
 
-        if (this.useVertexPulling) {
+        const renderingMesh = subMesh ? subMesh.getRenderingMesh() : mesh;
+        if (renderingMesh && this.useVertexPulling) {
             defines.push("#define USE_VERTEX_PULLING");
+
+            const indexBuffer = renderingMesh.geometry?.getIndexBuffer();
+            if (indexBuffer) {
+                defines.push("#define VERTEX_PULLING_USE_INDEX_BUFFER");
+                if (indexBuffer.is32Bits) {
+                    defines.push("#define VERTEX_PULLING_INDEX_BUFFER_32BITS");
+                }
+            }
         }
 
         const drawWrapper = storeEffectOnSubMeshes ? subMesh._getDrawWrapper(undefined, true) : this._drawWrapper;

packages/dev/core/src/Materials/standardMaterial.ts

@@ -1249,7 +1249,8 @@ export class StandardMaterial extends PushMaterial {
             this.needAlphaTestingForMesh(mesh),
             defines,
             this._applyDecalMapAfterDetailMap,
-            this._useVertexPulling
+            this._useVertexPulling,
+            subMesh.getRenderingMesh()
         );
 
         // Values that need to be evaluated on every frame