From 95064488db89ce925ed887a393241de303e84411 Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Tue, 21 Feb 2023 22:32:03 +0800 Subject: [PATCH] rename and layout codes. --- CMSceneGraph | 2 +- inc/hgl/graph/VKShaderModule.h | 4 ++-- src/SceneGraph/Vulkan/VKShaderModule.cpp | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/CMSceneGraph b/CMSceneGraph index 7312f272..ee17ef4c 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 7312f272adbdd6a6d57c96e53502ef4592705a9a +Subproject commit ee17ef4c80334b4aecbebd56a7c329e647572812 diff --git a/inc/hgl/graph/VKShaderModule.h b/inc/hgl/graph/VKShaderModule.h index 1fabc45e..ed8cfedb 100644 --- a/inc/hgl/graph/VKShaderModule.h +++ b/inc/hgl/graph/VKShaderModule.h @@ -79,10 +79,10 @@ public: //const uint32_t GetAttrCount()const{return attr_count;} - //const VkVertexInputBindingDescription * GetDescList ()const{return binding_list;} + //const VkVertexInputBindingDescription * GetBindList ()const{return binding_list;} //const VkVertexInputAttributeDescription * GetAttrList ()const{return attribute_list;} - //const VkVertexInputBindingDescription * GetDesc (const uint32_t index)const{return (index>=attr_count?nullptr:binding_list+index);} + //const VkVertexInputBindingDescription * GetBind (const uint32_t index)const{return (index>=attr_count?nullptr:binding_list+index);} //const VkVertexInputAttributeDescription * GetAttr (const uint32_t index)const{return (index>=attr_count?nullptr:attribute_list+index);} public: diff --git a/src/SceneGraph/Vulkan/VKShaderModule.cpp b/src/SceneGraph/Vulkan/VKShaderModule.cpp index 21f3089e..4177d4cf 100644 --- a/src/SceneGraph/Vulkan/VKShaderModule.cpp +++ b/src/SceneGraph/Vulkan/VKShaderModule.cpp @@ -114,10 +114,6 @@ VIL *VertexShaderModule::CreateVIL(const VILConfig *cfg) bind->inputRate =vac.instance?VK_VERTEX_INPUT_RATE_INSTANCE:VK_VERTEX_INPUT_RATE_VERTEX; } - // - { - } - bind->stride =GetStrideByFormat(attr->format); ++attr;