From f161404584209609f37e217a97107a0b9b1cc148 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Tue, 7 Apr 2020 17:56:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E9=87=8F=E6=94=B9=E5=90=8D=EF=BC=8C?= =?UTF-8?q?=E4=BB=A5=E7=89=B9=E5=88=AB=E6=8F=90=E7=A4=BA=E5=85=B6=E5=AE=9A?= =?UTF-8?q?=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/RenderDevice/Vulkan/VKMaterial.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/RenderDevice/Vulkan/VKMaterial.cpp b/src/RenderDevice/Vulkan/VKMaterial.cpp index f2e83920..4825ed0c 100644 --- a/src/RenderDevice/Vulkan/VKMaterial.cpp +++ b/src/RenderDevice/Vulkan/VKMaterial.cpp @@ -14,13 +14,11 @@ Material *CreateMaterial(Device *dev,ShaderModuleMap *shader_maps) if(shader_count<2) 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); - const VertexShaderModule *vertex_sm=(VertexShaderModule *)sm; - DescriptorSetLayoutCreater *dsl_creater=new DescriptorSetLayoutCreater(dev); List *shader_stage_list=new List; @@ -31,10 +29,10 @@ Material *CreateMaterial(Device *dev,ShaderModuleMap *shader_maps) auto **itp=shader_maps->GetDataList(); for(int i=0;iright; - memcpy(p,sm->GetCreateInfo(),sizeof(VkPipelineShaderStageCreateInfo)); + vsm=(*itp)->right; + memcpy(p,vsm->GetCreateInfo(),sizeof(VkPipelineShaderStageCreateInfo)); - dsl_creater->Bind(sm->GetResource(),sm->GetStage()); + dsl_creater->Bind(vsm->GetResource(),vsm->GetStage()); ++p; ++itp;