fix totalSize computation in BindGroupFormat which crashes dynamic bu…

…ffer allocation
maptalks · Mar 10, 2025 · 10932eb · 10932eb
1 parent 5bdf412
commit 10932eb
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 15 deletions.
diff --git a/packages/reshader.gl/src/common/WebGLConstants.ts b/packages/reshader.gl/src/common/WebGLConstants.ts
@@ -0,0 +1,6 @@
+export const GL_NEAREST = 0x2600;
+export const GL_LINEAR = 0x2601;
+export const GL_LINEAR_MIPMAP_LINEAR = 0x2703;
+
+export const MAG_FILTER = 0x2800;
+export const MIN_FILTER = 0x2801;
diff --git a/packages/reshader.gl/src/shader/ImageShader.js b/packages/reshader.gl/src/shader/ImageShader.js
@@ -13,6 +13,7 @@ class ImageShader extends MeshShader {
         config.vert = vert;
         config.frag = frag;
         super({
+            name: 'image',
             vert,
             frag,
             wgslVert,

diff --git a/packages/reshader.gl/src/shader/Shader.ts b/packages/reshader.gl/src/shader/Shader.ts
@@ -451,8 +451,7 @@ export default class GPUShader extends GLShader {
         const passEncoder: GPURenderPassEncoder = this._getCurrentRenderPassEncoder(device);
         passEncoder.setPipeline(command.pipeline);
 
-        const { key, bindGroupFormat, pipeline, vertexInfo } = command;
-        const layout = pipeline.getBindGroupLayout(0);
+        const { key, bindGroupFormat, vertexInfo, layout } = command;
         // 1. 生成shader uniform 需要的dynamic buffer
         if (!this._buffers) {
             this._buffers = {};

diff --git a/packages/reshader.gl/src/shader/wgsl/image_frag.wgsl b/packages/reshader.gl/src/shader/wgsl/image_frag.wgsl
@@ -15,10 +15,10 @@ struct Scene {
 
 @fragment
 fn main(
-    @location(0) vTexCoord : vec2f
+    @location(0) vTexCoord : vec2f,
 ) -> @location(0) vec4f {
     var fragColor = textureSample(baseColorTexture, baseColorTextureSampler, vTexCoord);
-    // fragColor *= scene.baseColor;
+    fragColor *= scene.baseColor;
     #if HAS_DEBUG
         var debugColor = textureSample(debugTexture, debugTextureSampler, vTexCoord);
         fragColor = vec4f(
@@ -27,8 +27,7 @@ fn main(
         );
     #endif
     if (fragColor.a < scene.alphaTest) {
-        // discard;
+        discard;
     }
-    return fragColor * 1.0;
-    // return vec4f(1.0, 0.0, 0.0, 1.0);
+    return fragColor * scene.opacity;
 }
diff --git a/packages/reshader.gl/src/shader/wgsl/image_vert.wgsl b/packages/reshader.gl/src/shader/wgsl/image_vert.wgsl
@@ -1,5 +1,5 @@
 struct Uniforms {
-    projViewModelMatrix : mat4x4f,
+    projViewModelMatrix : mat4x4f
 }
 
 @group(0) @binding(0) var<uniform> uniforms : Uniforms;

diff --git a/packages/reshader.gl/src/webgpu/BindGroupFormat.ts b/packages/reshader.gl/src/webgpu/BindGroupFormat.ts
@@ -7,6 +7,7 @@ import GraphicsDevice from "./GraphicsDevice";
 import { ShaderUniforms } from "../types/typings";
 import AbstractTexture from "../AbstractTexture";
 import GraphicsTexture from "./GraphicsTexture";
+import { roundUp } from "./common/math";
 
 let uuid = 0;
 
@@ -63,12 +64,12 @@ export default class BindGroupFormat {
                 let index = this._shaderUniforms.index;
                 this._shaderUniforms[index++] = uniform;
                 this._shaderUniforms.index = index;
-                this._shaderUniforms.totalSize += uniform.size;
+                this._shaderUniforms.totalSize += roundUp(uniform.size, this.alignment);;
             } else {
                 let index = this._meshUniforms.index;
                 this._meshUniforms[index++] = uniform;
                 this._meshUniforms.index = index;
-                this._meshUniforms.totalSize += uniform.size;
+                this._meshUniforms.totalSize += roundUp(uniform.size, this.alignment);
             }
         }
     }
@@ -122,7 +123,7 @@ export default class BindGroupFormat {
                         buffer: allocation.gpuBuffer,
                         // offset 永远设为0，在setBindGroup中设置dynamicOffsets
                         // offset: 0,
-                        size: Math.max(group.size, this.alignment)
+                        size: roundUp(group.size, this.alignment)
                     }
                 });
             }

diff --git a/packages/reshader.gl/src/webgpu/CommandBuilder.ts b/packages/reshader.gl/src/webgpu/CommandBuilder.ts
@@ -62,14 +62,16 @@ export default class CommandBuilder {
         const pipeline = this._createPipeline(device, vert, vertexInfo, frag, layout, mesh, pipelineDesc, fbo);
 
         const bindGroupMapping = this._createBindGroupMapping(vertGroups, fragGroups, mesh);
-        const bindGroupFormat = new BindGroupFormat(this.name, bindGroupMapping, device.wgpu.limits.minUniformBufferOffsetAlignment);
+        const alignment = device.wgpu.limits.minUniformBufferOffsetAlignment;
+        const bindGroupFormat = new BindGroupFormat(this.name, bindGroupMapping, alignment);
         const activeAttributes = this._getActiveAttributes(vertexInfo);
 
         return {
+            layout,
             pipeline,
             vertexInfo,
-            bindGroupMapping,
             bindGroupFormat,
+            bindGroupMapping,
             activeAttributes
         };
     }

diff --git a/packages/reshader.gl/src/webgpu/DynamicBuffer.ts b/packages/reshader.gl/src/webgpu/DynamicBuffer.ts
@@ -3,6 +3,7 @@ import { ShaderUniformValue } from "../types/typings";
 import DynamicBufferPool, { DynamicBufferAllocation } from "./DynamicBufferPool";
 import { isArray, isFunction } from "../common/Util";
 import DynamicOffsets from "./DynamicOffsets";
+import { roundUp } from "./common/math";
 
 export default class DynamicBuffer {
     bindgroupMapping: any;
@@ -45,13 +46,13 @@ export default class DynamicBuffer {
                     const size = member.size;
                     this._fillValue(storage, offset, size, value);
                 }
-                dynamicOffset += Math.max(mapping[i].size, bufferAlignment);
+                dynamicOffset += roundUp(mapping[i].size, bufferAlignment);
             } else if (uniform.resourceType === ResourceType.Uniform) {
                 dynamicOffsets.addItem({ binding: uniform.binding, offset: dynamicOffset });
                 const value = uniformValues[uniform.name];
                 const size = isFunction(uniform.size) ? uniform.size() : uniform.size;
                 this._fillValue(storage, dynamicOffset, size, value);
-                dynamicOffset += Math.max(size, bufferAlignment);
+                dynamicOffset += roundUp(size, bufferAlignment);
             }
         }