From c8131db208c18e24b7809d3fba817196f678742f Mon Sep 17 00:00:00 2001 From: hyzboy Date: Sun, 5 May 2019 21:42:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8FVKShaderParse.h=E5=88=B0src?= =?UTF-8?q?=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/RenderDevice/Vulkan/CMakeLists.txt | 4 ++-- src/RenderDevice/Vulkan/VKShaderModule.cpp | 2 +- src/RenderDevice/Vulkan/VKShaderModuleManage.cpp | 2 +- .../graph/vulkan => src/RenderDevice/Vulkan}/VKShaderParse.h | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename {inc/hgl/graph/vulkan => src/RenderDevice/Vulkan}/VKShaderParse.h (100%) diff --git a/src/RenderDevice/Vulkan/CMakeLists.txt b/src/RenderDevice/Vulkan/CMakeLists.txt index e901d35c..c7011894 100644 --- a/src/RenderDevice/Vulkan/CMakeLists.txt +++ b/src/RenderDevice/Vulkan/CMakeLists.txt @@ -19,7 +19,6 @@ ${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKSemaphore.h ${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKShaderModule.h ${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKShaderModuleManage.h - ${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKShaderParse.h ${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKSurfaceExtensionName.h ${ROOT_INCLUDE_PATH}/hgl/graph/vulkan/VKVertexAttributeBinding.h) @@ -37,6 +36,7 @@ SET(RENDER_DEVICE_VULKAN_SOURCE VKFormat.cpp VKDescriptorSetLayoutCreater.cpp VKDescriptorSetLayoutCreater.h VKRenderPass.cpp + VKShaderParse.h VKShaderModule.cpp VKShaderModuleManage.cpp VKVertexAttributeBinding.cpp @@ -54,6 +54,6 @@ SOURCE_GROUP("Header Files" FILES ${RENDER_DEVICE_VULKAN_HEADER}) SOURCE_GROUP("Source Files" FILES ${RENDER_DEVICE_VULKAN_SOURCE}) #SOURCE_GROUP("JSON Source Files" FILES ${RENDER_DEVICE_VULKAN_JSON_SOURCE}) -add_library(ULRE.RenderDevice.Vulkan STATIC ${RENDER_DEVICE_VULKAN_HEADER} +add_library(ULRE.RenderDevice.Vulkan STATIC ${RENDER_DEVICE_VULKAN_HEADER} ${RENDER_DEVICE_VULKAN_SOURCE} ${RENDER_DEVICE_VULKAN_JSON_SOURCE}) diff --git a/src/RenderDevice/Vulkan/VKShaderModule.cpp b/src/RenderDevice/Vulkan/VKShaderModule.cpp index 4d0dd97a..59631310 100644 --- a/src/RenderDevice/Vulkan/VKShaderModule.cpp +++ b/src/RenderDevice/Vulkan/VKShaderModule.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include"VKShaderParse.h" VK_NAMESPACE_BEGIN ShaderModule::ShaderModule(VkDevice dev,int id,VkPipelineShaderStageCreateInfo *sci,const ShaderParse *sp) diff --git a/src/RenderDevice/Vulkan/VKShaderModuleManage.cpp b/src/RenderDevice/Vulkan/VKShaderModuleManage.cpp index 682f5f39..4150af1b 100644 --- a/src/RenderDevice/Vulkan/VKShaderModuleManage.cpp +++ b/src/RenderDevice/Vulkan/VKShaderModuleManage.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include"VKShaderParse.h" #include VK_NAMESPACE_BEGIN diff --git a/inc/hgl/graph/vulkan/VKShaderParse.h b/src/RenderDevice/Vulkan/VKShaderParse.h similarity index 100% rename from inc/hgl/graph/vulkan/VKShaderParse.h rename to src/RenderDevice/Vulkan/VKShaderParse.h