Skip to content

V3.6.0 pipeline use4 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
star-e merged 3 commits into from
Jun 10, 2022
Merged

V3.6.0 pipeline use4 #29

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9fef36
Merge pull request #30 from star-e/v3.6.0-pipeline
zxx43 Jun 9, 2022
690dc70
change some layouts' visibility
zxx43 Jun 10, 2022
ec7c6d0
Merge branch 'v3.6.0-pipeline' into v3.6.0_pipeline_use4
zxx43 Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cocos/core/pipeline/custom/web-descriptor-hierarchy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,14 +165,14 @@ export class WebDescriptorHierarchy {

for (let k = 0; k < shader.buffers.length; ++k) {
const bufferInfo: EffectAsset.IBufferInfo = shader.buffers[k];
const targetBlock: DescriptorBlock = this.getLayoutBlock(UpdateFrequency.PER_QUEUE,
const targetBlock: DescriptorBlock = this.getLayoutBlock(UpdateFrequency.PER_BATCH,
ParameterType.TABLE, DescriptorTypeOrder.STORAGE_BUFFER, bufferInfo.stageFlags, queueDB);
this.setDescriptor(targetBlock, bufferInfo.name, Type.UNKNOWN);
}

for (let k = 0; k < shader.images.length; ++k) {
const imageInfo: EffectAsset.IImageInfo = shader.images[k];
const targetBlock: DescriptorBlock = this.getLayoutBlock(UpdateFrequency.PER_QUEUE,
const targetBlock: DescriptorBlock = this.getLayoutBlock(UpdateFrequency.PER_BATCH,
ParameterType.TABLE, DescriptorTypeOrder.STORAGE_IMAGE, imageInfo.stageFlags, queueDB);
this.setDescriptor(targetBlock, imageInfo.name, imageInfo.type);
}
Expand All @@ -186,14 +186,14 @@ export class WebDescriptorHierarchy {

for (let k = 0; k < shader.samplers.length; ++k) {
const samplerInfo: EffectAsset.ISamplerInfo = shader.samplers[k];
const targetBlock: DescriptorBlock = this.getLayoutBlock(UpdateFrequency.PER_QUEUE,
const targetBlock: DescriptorBlock = this.getLayoutBlock(UpdateFrequency.PER_BATCH,
ParameterType.TABLE, DescriptorTypeOrder.SAMPLER, samplerInfo.stageFlags, queueDB);
this.setDescriptor(targetBlock, samplerInfo.name, Type.SAMPLER);
}

for (let k = 0; k < shader.textures.length; ++k) {
const texInfo: EffectAsset.ITextureInfo = shader.textures[k];
const targetBlock: DescriptorBlock = this.getLayoutBlock(UpdateFrequency.PER_QUEUE,
const targetBlock: DescriptorBlock = this.getLayoutBlock(UpdateFrequency.PER_BATCH,
ParameterType.TABLE, DescriptorTypeOrder.TEXTURE, texInfo.stageFlags, queueDB);
this.setDescriptor(targetBlock, texInfo.name, texInfo.type);
}
Expand All @@ -208,7 +208,7 @@ export class WebDescriptorHierarchy {
// Add queue layout from define.ts
const localUniformTarget: DescriptorBlock = this.getLayoutBlock(UpdateFrequency.PER_INSTANCE,
ParameterType.TABLE, DescriptorTypeOrder.UNIFORM_BUFFER, ShaderStageFlagBit.VERTEX, queueDB);
const localLightTarget: DescriptorBlock = this.getLayoutBlock(UpdateFrequency.PER_QUEUE,
const localLightTarget: DescriptorBlock = this.getLayoutBlock(UpdateFrequency.PER_BATCH,
ParameterType.TABLE, DescriptorTypeOrder.DYNAMIC_UNIFORM_BUFFER, ShaderStageFlagBit.FRAGMENT, queueDB);
const localUITarget: DescriptorBlock = this.getLayoutBlock(UpdateFrequency.PER_INSTANCE,
ParameterType.TABLE, DescriptorTypeOrder.DYNAMIC_UNIFORM_BUFFER, ShaderStageFlagBit.VERTEX, queueDB);
Expand Down