From 5f4dd09f92e798743fbafffaa68decc5c3ed8cbd Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Sat, 18 Mar 2023 21:07:21 +0800 Subject: [PATCH] updated ShaderStage --- CMSceneGraph | 2 +- src/SceneGraph/Vulkan/VKShaderResource.cpp | 6 +++--- src/ShaderGen/ShaderDescriptorInfo.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMSceneGraph b/CMSceneGraph index 80202ff3..f51a6a98 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 80202ff30e6e91f84e890ff641a2c132a086aff4 +Subproject commit f51a6a98d6268e93fe854a2c3a07e559778c3e54 diff --git a/src/SceneGraph/Vulkan/VKShaderResource.cpp b/src/SceneGraph/Vulkan/VKShaderResource.cpp index 9eb910ee..a3914a15 100644 --- a/src/SceneGraph/Vulkan/VKShaderResource.cpp +++ b/src/SceneGraph/Vulkan/VKShaderResource.cpp @@ -10,7 +10,7 @@ VK_NAMESPACE_BEGIN { ObjectMap shader_resource_by_filename; - const bool LoadShaderStageAttributes(ShaderAttributeArray &ss_list,io::ConstBufferReader &cbr) + const bool LoadShaderStageAttributes(ShaderAttributeArray &sa_array,io::ConstBufferReader &cbr) { uint count; @@ -19,9 +19,9 @@ VK_NAMESPACE_BEGIN if(count<=0) return(false); - Init(ss_list,count); + Init(&sa_array,count); - ShaderAttribute *ss=ss_list.items; + ShaderAttribute *ss=sa_array.items; for(uint i=0;ilocation=stage_io.input.count; - Append(stage_io.input,ss); + Append(&stage_io.input,ss); return(true); } @@ -45,7 +45,7 @@ bool ShaderDescriptorInfo::AddOutput(ShaderAttribute *ss) ss->location=stage_io.output.count; - Append(stage_io.output,ss); + Append(&stage_io.output,ss); return(true); }