hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

变量改名，以特别提示其定义

Browse Source
This commit is contained in:
hyzboy 2020-04-07 17:56:15 +08:00
parent 125392b037
commit f161404584
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/RenderDevice/Vulkan/VKMaterial.cpp
View File

@ -14,13 +14,11 @@ Material *CreateMaterial(Device *dev,ShaderModuleMap *shader_maps)
if(shader_count<2) if(shader_count<2)
return(nullptr); return(nullptr);
const ShaderModule *sm; const ShaderModule *vsm;
if(!shader_maps->Get(VK_SHADER_STAGE_VERTEX_BIT,sm)) if(!shader_maps->Get(VK_SHADER_STAGE_VERTEX_BIT,vsm))
return(nullptr); return(nullptr);
const VertexShaderModule *vertex_sm=(VertexShaderModule *)sm;
DescriptorSetLayoutCreater *dsl_creater=new DescriptorSetLayoutCreater(dev); DescriptorSetLayoutCreater *dsl_creater=new DescriptorSetLayoutCreater(dev);
List<VkPipelineShaderStageCreateInfo> *shader_stage_list=new List<VkPipelineShaderStageCreateInfo>; List<VkPipelineShaderStageCreateInfo> *shader_stage_list=new List<VkPipelineShaderStageCreateInfo>;
@ -31,10 +29,10 @@ Material *CreateMaterial(Device *dev,ShaderModuleMap *shader_maps)
auto **itp=shader_maps->GetDataList(); auto **itp=shader_maps->GetDataList();
for(int i=0;i<shader_count;i++) for(int i=0;i<shader_count;i++)
{ {
sm=(*itp)->right; vsm=(*itp)->right;
memcpy(p,sm->GetCreateInfo(),sizeof(VkPipelineShaderStageCreateInfo)); memcpy(p,vsm->GetCreateInfo(),sizeof(VkPipelineShaderStageCreateInfo));
dsl_creater->Bind(sm->GetResource(),sm->GetStage()); dsl_creater->Bind(vsm->GetResource(),vsm->GetStage());
++p; ++p;
++itp; ++itp;