ShaderVk, PipelineLayoutVk, PipelineStateVkImpl update, based on #729 #747
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… it can be reconstructed in "PatchShaderConvertUniformBufferToPushConstant" later. 2. Add push constants info to "PipelineLayoutVk" and setup "PipelineLayoutCI.pPushConstantRanges" properly.
…ShaderResources from SPIRV even after ShaderVkImpl::Initialize.
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| } | ||
|
|
||
| void PipelineLayoutVk::Create(RenderDeviceVkImpl* pDeviceVk, RefCntAutoPtr<PipelineResourceSignatureVkImpl> ppSignatures[], Uint32 SignatureCount) noexcept(false) | ||
| void PipelineLayoutVk::Create(RenderDeviceVkImpl* pDeviceVk, |
Check notice
Code scanning / CodeQL
No raw arrays in interfaces Note
| Uint32 ArraySize = Attribs.ArraySize; | ||
| if (Flags & PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS) | ||
| { | ||
| VERIFY(Flags == PIPELINE_RESOURCE_FLAG_INLINE_CONSTANTS, "INLINE_CONSTANTS flag cannot be combined with other flags."); |
Check warning
Code scanning / PREfast
Use 'bitwise and' to check if a flag is set. Warning
hzqst
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Extends
PipelineStateVkImpl::ShaderStageInfowithShaderResourcesso shader reflection data can be reconstructed/updated after SPIR-V patching (e.g., UBO → push constants).Introduces
PushConstantInfoVkand stores push-constant metadata inPipelineLayoutVk;PipelineLayoutVk::Create(...)now configuresVkPipelineLayoutCreateInfo.pPushConstantRanges(and validates size vsmaxPushConstantsSize).Adds logic in Vulkan PSO creation to derive push-constant info from signatures and to patch shaders via
ConvertUBOToPushConstants, updating both SPIR-V and the associated shader resources.Tweaks validation so push constants are validated but skip descriptor-set resource cache checks; fixes descriptor counting to use
ResDesc.GetArraySize().Adds
ShaderVkImpl::CreateSPIRVShaderResources(const std::vector<uint32_t>&)to rebuildSPIRVShaderResourcesfrom SPIR-V afterShaderVkImpl::Initialize.Persists CI-derived state (
EntryPoint,LoadConstantBufferReflection) so reconstructed resources match the original reflection configuration.Changes
GetShaderResources()to return a null shared_ptr while compiling asynchronously instead of asserting.Updates
SerializedPipelineStateImpl::PatchShadersVkto also transferShaderResourcesintoPipelineStateVkImpl::ShaderStageInfo, ensuring archived/serialized Vulkan PSOs keep the per-stage reflection/resources alongside shaders and SPIR-V.