From 15324d9c863774a27781679bc3bdb7b353c60d15 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Sun, 26 Mar 2023 00:04:31 +0800 Subject: [PATCH] layout codes. --- inc/hgl/graph/VKDevice.h | 15 +++++---------- src/ShaderGen/CMakeLists.txt | 3 +-- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/inc/hgl/graph/VKDevice.h b/inc/hgl/graph/VKDevice.h index a3904473..f6132ea3 100644 --- a/inc/hgl/graph/VKDevice.h +++ b/inc/hgl/graph/VKDevice.h @@ -17,17 +17,12 @@ #include #include -namespace hgl -{ - namespace graph - { - class TileData; - class TileFont; - class FontSource; - }//namespace graph -}//namespace hgl - VK_NAMESPACE_BEGIN + +class TileData; +class TileFont; +class FontSource; + /* * GPU设备创建信息 */ diff --git a/src/ShaderGen/CMakeLists.txt b/src/ShaderGen/CMakeLists.txt index 4b21608e..4d317f66 100644 --- a/src/ShaderGen/CMakeLists.txt +++ b/src/ShaderGen/CMakeLists.txt @@ -42,8 +42,7 @@ SET(STD_MTL_2D_HEADER_PATH ${STD_MTL_HEADER_PATH}/2d) SET(STD_MTL_2D_SOURCE_FILES ${STD_MTL_2D_HEADER_PATH}/VertexColor2D.h 2d/VertexColor2D.cpp) -SET(STANDARD_MATERIAL_SOURCE ${STD_MTL_HEADER_PATH}/StdMaterial.h - GlobalShaderUBO.cpp) +SET(STANDARD_MATERIAL_SOURCE ${STD_MTL_HEADER_PATH}/StdMaterial.h) SOURCE_GROUP("Standard Material" FILES ${STANDARD_MATERIAL_SOURCE}) SOURCE_GROUP("Standard Material\\2D" FILES ${STD_MTL_2D_SOURCE_FILES})