From fb3cd120616e154d6128e2a50cd712b790e7fefe Mon Sep 17 00:00:00 2001 From: Yun Hsiao Wu Date: Mon, 27 Sep 2021 16:25:45 +0800 Subject: [PATCH] remove block/buffer.count (#9406) --- cocos/core/assets/effect-asset.ts | 2 -- cocos/core/renderer/core/program-lib.ts | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cocos/core/assets/effect-asset.ts b/cocos/core/assets/effect-asset.ts index 666c34cb79..394819cd3d 100644 --- a/cocos/core/assets/effect-asset.ts +++ b/cocos/core/assets/effect-asset.ts @@ -73,7 +73,6 @@ export declare namespace EffectAsset { binding: number; name: string; members: Uniform[]; - count: number; stageFlags: ShaderStageFlags; } export interface ISamplerTextureInfo { @@ -101,7 +100,6 @@ export declare namespace EffectAsset { export interface IBufferInfo { binding: number; name: string; - count: number; memoryAccess: MemoryAccess; stageFlags: ShaderStageFlags; } diff --git a/cocos/core/renderer/core/program-lib.ts b/cocos/core/renderer/core/program-lib.ts index 8808663b51..c78387dfca 100644 --- a/cocos/core/renderer/core/program-lib.ts +++ b/cocos/core/renderer/core/program-lib.ts @@ -275,10 +275,10 @@ class ProgramLib { for (let i = 0; i < tmpl.buffers.length; i++) { const buffer = tmpl.buffers[i]; tmplInfo.bindings.push(new DescriptorSetLayoutBinding(buffer.binding, - DescriptorType.STORAGE_BUFFER, buffer.count, buffer.stageFlags)); + DescriptorType.STORAGE_BUFFER, 1, buffer.stageFlags)); tmplInfo.shaderInfo.buffers.push(new UniformStorageBuffer( - SetIndex.MATERIAL, buffer.binding, buffer.name, buffer.count, buffer.memoryAccess, - )); + SetIndex.MATERIAL, buffer.binding, buffer.name, 1, buffer.memoryAccess, + )); // effect compiler guarantees buffer count = 1 } for (let i = 0; i < tmpl.images.length; i++) { const image = tmpl.images[i];