From 42f63c5ef1c7397e4416b971f820ddc68f619749 Mon Sep 17 00:00:00 2001 From: "HuYingzhuo(hugo/hyzboy)" Date: Sun, 19 Mar 2023 13:37:55 +0800 Subject: [PATCH] renamed few values at VKShaderModule --- inc/hgl/graph/VKShaderModule.h | 4 +- inc/hgl/graph/VKShaderResource.h | 4 +- src/SceneGraph/Vulkan/VKShaderModule.cpp | 48 ++++++++++++------------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/inc/hgl/graph/VKShaderModule.h b/inc/hgl/graph/VKShaderModule.h index b6ae718a..339e75f1 100644 --- a/inc/hgl/graph/VKShaderModule.h +++ b/inc/hgl/graph/VKShaderModule.h @@ -60,7 +60,7 @@ class VertexShaderModule:public ShaderModule uint32_t attr_count; VAT *type_list; const char **name_list; - ShaderAttribute *attr_list; + ShaderAttribute *shader_attr_list; private: @@ -77,7 +77,7 @@ public: const int GetInputBinding(const AnsiString &name)const{return shader_resource->GetInputBinding(name);} const ShaderAttribute * GetInput (const AnsiString &name)const{return shader_resource->GetInput(name);} const uint GetInputCount () const{return shader_resource->GetInputCount();} - const ShaderAttributeArray & GetInputs () const{return shader_resource->GetInputs();} + const ShaderAttributeArray & GetInputs () const{return shader_resource->GetInputs();} //const uint32_t GetAttrCount()const{return attr_count;} diff --git a/inc/hgl/graph/VKShaderResource.h b/inc/hgl/graph/VKShaderResource.h index f30c6e73..a292ce37 100644 --- a/inc/hgl/graph/VKShaderResource.h +++ b/inc/hgl/graph/VKShaderResource.h @@ -29,8 +29,8 @@ public: const uint32_t * GetCode ()const {return (uint32_t *)spv_data;} const uint32_t GetCodeSize ()const {return spv_size;} - ShaderAttributeArray & GetInputs () {return stage_io.input;} -// ShaderAttributeArray & GetOutputs () {return stage_io.output;} + ShaderAttributeArray & GetInputs () {return stage_io.input;} +// ShaderAttributeArray & GetOutputs () {return stage_io.output;} const uint GetInputCount ()const {return stage_io.input.count;} // const uint GetOutputCount ()const {return stage_io.output.count;} diff --git a/src/SceneGraph/Vulkan/VKShaderModule.cpp b/src/SceneGraph/Vulkan/VKShaderModule.cpp index a1021ece..fd5c88c6 100644 --- a/src/SceneGraph/Vulkan/VKShaderModule.cpp +++ b/src/SceneGraph/Vulkan/VKShaderModule.cpp @@ -47,15 +47,15 @@ VertexShaderModule::VertexShaderModule(VkDevice dev,VkPipelineShaderStageCreateI const ShaderAttributeArray &stage_input_list=sr->GetInputs(); attr_count=stage_input_list.count; - attr_list=stage_input_list.items; + shader_attr_list=stage_input_list.items; name_list=new const char *[attr_count]; type_list=new VAT[attr_count]; for(uint i=0;ibinding =i; - attr->location =si->location; //此值对应shader中的layout(location= + attr_desc->binding =i; + attr_desc->location =sa->location; //此值对应shader中的layout(location= - attr->offset =0; + attr_desc->offset =0; - bind->binding =i; //binding对应在vkCmdBindVertexBuffer中设置的缓冲区的序列号，所以这个数字必须从0开始，而且紧密排列。 - //在Renderable类中，buffer_list必需严格按照本此binding为序列号排列 + bind_desc->binding =i; //binding对应在vkCmdBindVertexBuffer中设置的缓冲区的序列号，所以这个数字必须从0开始，而且紧密排列。 + //在Renderable类中，buffer_list必需严格按照本此binding为序列号排列 - if(!cfg||!cfg->Get(si->name,vac)) + if(!cfg||!cfg->Get(sa->name,vac)) { - attr->format =GetVulkanFormat(si); + attr_desc->format =GetVulkanFormat(sa); - //if(memcmp((*si)->name.c_str(),"Inst_",5)==0) //不可以使用CaseComp("Inst_",5)会被认为是比较一个5字长的字符串，而不是只比较5个字符 - // bind->inputRate =VK_VERTEX_INPUT_RATE_INSTANCE; + //if(memcmp((*sa)->name.c_str(),"Inst_",5)==0) //不可以使用CaseComp("Inst_",5)会被认为是比较一个5字长的字符串，而不是只比较5个字符 + // bind_desc->inputRate =VK_VERTEX_INPUT_RATE_INSTANCE; //else - bind->inputRate =VK_VERTEX_INPUT_RATE_VERTEX; + bind_desc->inputRate =VK_VERTEX_INPUT_RATE_VERTEX; } else { if(vac.format!=PF_UNDEFINED) - attr->format =vac.format; + attr_desc->format =vac.format; else - attr->format =GetVulkanFormat(si); + attr_desc->format =GetVulkanFormat(sa); - bind->inputRate =vac.instance?VK_VERTEX_INPUT_RATE_INSTANCE:VK_VERTEX_INPUT_RATE_VERTEX; + bind_desc->inputRate =vac.instance?VK_VERTEX_INPUT_RATE_INSTANCE:VK_VERTEX_INPUT_RATE_VERTEX; } - bind->stride =GetStrideByFormat(attr->format); + bind_desc->stride =GetStrideByFormat(attr_desc->format); - ++attr; - ++bind; + ++attr_desc; + ++bind_desc; - ++si; + ++sa; } VIL *vil=new VIL(attr_count,name_list,type_list,binding_list,attribute_list);