From 5d08717c21207d8d5bb5b3375002942dfd0eb25e Mon Sep 17 00:00:00 2001 From: hyzboy Date: Sat, 19 Sep 2020 18:36:05 +0800 Subject: [PATCH] use hgl_cpy instead memcpy --- CMCore | 2 +- CMSceneGraph | 2 +- res | 2 +- src/RenderDevice/Vulkan/VKMaterial.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMCore b/CMCore index 3e9b703e..29785b9d 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 3e9b703ebcdf4167707d76b6bbdb752eb63de437 +Subproject commit 29785b9d2a7160d97c214d689f7c76f2d07b9ce5 diff --git a/CMSceneGraph b/CMSceneGraph index 51d8086c..955cf63c 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 51d8086c98b5efeacdf07b3e2f1b5097bc401150 +Subproject commit 955cf63c7f911b3a8af2be9a1a0facffdecd34bb diff --git a/res b/res index 330af463..73d977cd 160000 --- a/res +++ b/res @@ -1 +1 @@ -Subproject commit 330af463414de83240bf6290d6f9a52aa5b55af3 +Subproject commit 73d977cdbaa2ea287e49943648dbd882c1f9cfff diff --git a/src/RenderDevice/Vulkan/VKMaterial.cpp b/src/RenderDevice/Vulkan/VKMaterial.cpp index 075762a8..fb7d2443 100644 --- a/src/RenderDevice/Vulkan/VKMaterial.cpp +++ b/src/RenderDevice/Vulkan/VKMaterial.cpp @@ -31,7 +31,7 @@ Material *CreateMaterial(Device *dev,ShaderModuleMap *shader_maps) for(int i=0;iright; - memcpy(p,sm->GetCreateInfo(),sizeof(VkPipelineShaderStageCreateInfo)); + hgl_cpy(p,sm->GetCreateInfo()); dsl_creater->Bind(sm->GetDescriptorList(),sm->GetStage());