Address PR comments

Author: MiiBond

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

@@ -23,7 +23,6 @@ import { Texture } from "./Textures/texture";
 import type { CubeTexture } from "./Textures/cubeTexture";
 import type { Color3 } from "core/Maths/math.color";
 import type { Geometry } from "../Meshes/geometry";
-import { Vector3 } from "core/Maths/math.vector";
 
 // For backwards compatibility, we export everything from the pure version of this file.
 export * from "./materialHelper.functions.pure";
@@ -681,14 +680,14 @@ export function PrepareVertexPullingUniforms(geometry: Geometry): Nullable<Map<s
  * @param metadata The vertex pulling metadata
  */
 export function BindVertexPullingUniforms(effect: Effect, metadata: Map<string, IVertexPullingMetadata>): void {
-    if (!metadata || !effect) {
+    if (!effect) {
         return;
     }
 
     for (const [attribute, data] of metadata.entries()) {
         const uniformName = `vp_${attribute}_info`;
         // Pack into vec3: (offset, stride, type)
-        effect.setVector3(uniformName, new Vector3(data.offset, data.stride, data.type));
+        effect.setFloat3(uniformName, data.offset, data.stride, data.type);
     }
 }
 

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

@@ -901,14 +901,27 @@ export class ShaderMaterial extends PushMaterial {
             }
         }
 
+        const renderingMesh = subMesh ? subMesh.getRenderingMesh() : mesh;
+        if (renderingMesh && this.useVertexPulling) {
+            // Add vertex buffer metadata defines for proper stride/offset handling
+            const geometry = renderingMesh.geometry;
+            if (geometry) {
+                this._vertexPullingMetadata = PrepareVertexPullingUniforms(geometry);
+                if (this._vertexPullingMetadata) {
+                    for (const [attribute] of this._vertexPullingMetadata.entries()) {
+                        uniforms.push(`vp_${attribute}_info`);
+                    }
+                }
+            }
+        }
+
         if (this.customShaderNameResolve) {
             uniforms = uniforms.slice();
             uniformBuffers = uniformBuffers.slice();
             samplers = samplers.slice();
             shaderName = this.customShaderNameResolve(this.name, uniforms, uniformBuffers, samplers, defines, attribs);
         }
 
-        const renderingMesh = subMesh ? subMesh.getRenderingMesh() : mesh;
         if (renderingMesh && this.useVertexPulling) {
             defines.push("#define USE_VERTEX_PULLING");
 
@@ -919,12 +932,6 @@ export class ShaderMaterial extends PushMaterial {
                     defines.push("#define VERTEX_PULLING_INDEX_BUFFER_32BITS");
                 }
             }
-
-            // Add vertex buffer metadata defines for proper stride/offset handling
-            const geometry = renderingMesh.geometry;
-            if (geometry) {
-                this._vertexPullingMetadata = PrepareVertexPullingUniforms(geometry);
-            }
         }
 
         const drawWrapper = storeEffectOnSubMeshes ? subMesh._getDrawWrapper(undefined, true) : this._drawWrapper;

packages/dev/core/src/ShadersWGSL/iblVoxelGrid.vertex.fx

@@ -33,7 +33,7 @@ uniform invWorldScale: mat4x4f;
 varying vNormalizedPosition : vec3f;
 flat varying f_swizzle: i32;
 
-uniform vp_position_info: vec3f; // (bufferIndex, offset, stride, type)
+uniform vp_position_info: vec3f; // (offset, stride, type)
 
 fn convertToFloat(word: u32, byteInWord: u32, dataType: u32) -> f32 {
     switch (dataType) {