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

file rename, from ShaderModuleMap to VKShaderModuleMap

Browse Source
This commit is contained in:
hyzboy 2020-10-21 10:52:12 +08:00
parent 3c01881a6b
commit 114c57510c
8 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/hgl/graph/vulkan/VKDevice.h
View File

@ -13,7 +13,7 @@
#include<hgl/graph/vulkan/VKSwapchain.h>
#include<hgl/graph/vulkan/VKRenderTarget.h>
#include<hgl/graph/VertexAttribData.h>
#include<hgl/graph/vulkan/ShaderModuleMap.h>
#include<hgl/graph/vulkan/VKShaderModuleMap.h>
namespace hgl
{

2
inc/hgl/graph/vulkan/VKMaterial.h
View File

@ -4,7 +4,7 @@
#include<hgl/graph/vulkan/VK.h>
#include<hgl/type/Map.h>
#include<hgl/type/String.h>
#include<hgl/graph/vulkan/ShaderModuleMap.h>
#include<hgl/graph/vulkan/VKShaderModuleMap.h>
#include<hgl/graph/vulkan/VKVertexAttributeBinding.h>
VK_NAMESPACE_BEGIN
class DescriptorSetLayoutCreater;

0
inc/hgl/graph/vulkan/ShaderModuleMap.h → inc/hgl/graph/vulkan/VKShaderModuleMap.h
View File

34
src/GUI/CMakeLists.txt
View File

@ -1,14 +1,26 @@
file(GLOB GUI_HEADER ${ROOT_INCLUDE_PATH}/hgl/gui/*.*)
SET(GUI_INCLUDE_PATH ${ROOT_INCLUDE_PATH}/hgl/gui)
set(GUI_SOURCE Widget.cpp
Form.cpp
Panel.cpp
ThemeEngine.cpp
DefaultThemeEngine.h
DefaultThemeEngine.cpp)
SET(THEME_SOURCE ${GUI_INCLUDE_PATH}/ThemeForm.h
${GUI_INCLUDE_PATH}/ThemeEngine.h
ThemeEngine.cpp)
SOURCE_GROUP("Header Files" FILES ${GUI_HEADER})
SOURCE_GROUP("Source Files" FILES ${GUI_SOURCE})
SET(DEFAULT_THEME_SOURCE DefaultThemeEngine.h
DefaultThemeEngine.cpp
DTForm.h
DTForm.cpp)
add_cm_library(ULRE.GUI "ULRE" ${GUI_HEADER}
${GUI_SOURCE})
set(WIDGET_SOURCE ${GUI_INCLUDE_PATH}/Widget.h
${GUI_INCLUDE_PATH}/Layout.h
${GUI_INCLUDE_PATH}/Form.h
${GUI_INCLUDE_PATH}/Panel.h
Widget.cpp
Form.cpp
Panel.cpp)
SOURCE_GROUP("Widget" FILES ${WIDGET_SOURCE})
SOURCE_GROUP("Theme" FILES ${THEME_SOURCE})
SOURCE_GROUP("Theme\\Default" FILES ${DEFAULT_THEME_SOURCE})
add_cm_library(ULRE.GUI "ULRE" ${THEME_SOURCE}
${DEFAULT_THEME_SOURCE}
${WIDGET_SOURCE})

4
src/RenderDevice/Vulkan/CMakeLists.txt
View File

@ -48,8 +48,8 @@ SET(VK_DESCRIPTOR_SETS_SOURCE ${RD_INCLUDE_PATH}/VKDescriptorSets.h
SOURCE_GROUP("Descriptor Sets" FILES ${VK_DESCRIPTOR_SETS_SOURCE})
SET(VK_SHADER_SOURCE ${RD_INCLUDE_PATH}/VKShaderModule.h
${RD_INCLUDE_PATH}/ShaderModuleMap.h
ShaderModuleMap.cpp
${RD_INCLUDE_PATH}/VKShaderModuleMap.h
VKShaderModuleMap.cpp
VKShaderModule.cpp)
SET(VK_TEXTURE_SOURCE ${RD_INCLUDE_PATH}/VKImageView.h

2
src/RenderDevice/Vulkan/VKDatabaseMaterial.cpp
View File

@ -1,7 +1,7 @@
#include<hgl/graph/vulkan/VKShaderModule.h>
#include<hgl/graph/vulkan/VKMaterial.h>
#include<hgl/graph/vulkan/VKDevice.h>
#include<hgl/graph/vulkan/ShaderModuleMap.h>
#include<hgl/graph/vulkan/VKShaderModuleMap.h>
#include<hgl/graph/shader/ShaderResource.h>
#include<hgl/filesystem/FileSystem.h>
#include<hgl/graph/vulkan/VKDatabase.h>

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

@ -2,7 +2,7 @@
#include<hgl/graph/vulkan/VKDevice.h>
#include<hgl/graph/vulkan/VKDescriptorSets.h>
#include<hgl/graph/vulkan/VKShaderModule.h>
#include<hgl/graph/vulkan/ShaderModuleMap.h>
#include<hgl/graph/vulkan/VKShaderModuleMap.h>
#include<hgl/graph/vulkan/VKVertexAttributeBinding.h>
#include<hgl/graph/vulkan/VKBuffer.h>
#include"VKDescriptorSetLayoutCreater.h"

2
src/RenderDevice/Vulkan/ShaderModuleMap.cpp → src/RenderDevice/Vulkan/VKShaderModuleMap.cpp
View File

@ -1,4 +1,4 @@
#include<hgl/graph/vulkan/ShaderModuleMap.h>
#include<hgl/graph/vulkan/VKShaderModuleMap.h>
#include<hgl/graph/vulkan/VKShaderModule.h>
VK_NAMESPACE_BEGIN