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

fixed a few compile error.

Browse Source
This commit is contained in:
hyzboy 2023-05-16 02:23:45 +08:00
parent d660691cec
commit 8086fb76f1
No known key found for this signature in database
GPG Key ID: 067EE4525D4FB6D3
8 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/hgl/graph/VKRenderResource.h
View File

@ -98,11 +98,11 @@ public: //Material
const ShaderModule *CreateShaderModule(const OSString &filename,VkShaderStageFlagBits shader_stage,const uint32_t *spv_data,const size_t spv_size); const ShaderModule *CreateShaderModule(const OSString &filename,VkShaderStageFlagBits shader_stage,const uint32_t *spv_data,const size_t spv_size);
Material * CreateMaterial(const OSString &); Material * CreateMaterial(const OSString &);
Material * CreateMaterial(const MaterialCreateInfo *); Material * CreateMaterial(const mtl::MaterialCreateInfo *);
MaterialInstance * CreateMaterialInstance(Material *,const VILConfig *vil_cfg=nullptr); MaterialInstance * CreateMaterialInstance(Material *,const VILConfig *vil_cfg=nullptr);
MaterialInstance * CreateMaterialInstance(const OSString &,const VILConfig *vil_cfg=nullptr); MaterialInstance * CreateMaterialInstance(const OSString &,const VILConfig *vil_cfg=nullptr);
MaterialInstance * CreateMaterialInstance(const MaterialCreateInfo *,const VILConfig *vil_cfg=nullptr); MaterialInstance * CreateMaterialInstance(const mtl::MaterialCreateInfo *,const VILConfig *vil_cfg=nullptr);
Primitive * CreatePrimitive(const uint32_t vertex_count=0); Primitive * CreatePrimitive(const uint32_t vertex_count=0);

3
inc/hgl/graph/mtl/2d/VertexColor2D.h
View File

@ -1,8 +1,7 @@
#ifndef HGL_GRAPH_MTL_2D_VERTEX2D_INCLUDE #ifndef HGL_GRAPH_MTL_2D_VERTEX2D_INCLUDE
#define HGL_GRAPH_MTL_2D_VERTEX2D_INCLUDE #define HGL_GRAPH_MTL_2D_VERTEX2D_INCLUDE
#include"Std2DMaterial.h" #include<hgl/graph/mtl/2d/Material2DConfig.h>
#include<hgl/graph/CoordinateSystem.h>
STD_MTL_NAMESPACE_BEGIN STD_MTL_NAMESPACE_BEGIN
MaterialCreateInfo *CreateVertexColor2D(const Material2DConfig *); MaterialCreateInfo *CreateVertexColor2D(const Material2DConfig *);

3
inc/hgl/graph/mtl/MaterialConfig.h
View File

@ -7,6 +7,9 @@
#include<hgl/graph/VK.h> #include<hgl/graph/VK.h>
STD_MTL_NAMESPACE_BEGIN STD_MTL_NAMESPACE_BEGIN
class MaterialCreateInfo;
/** /**
* 材质配置结构 * 材质配置结构
*/ */

0
src/ShaderGen/common/UBOCommon.h → inc/hgl/graph/mtl/UBOCommon.h
View File

2
src/SceneGraph/Vulkan/VKRenderResource.cpp
View File

@ -72,7 +72,7 @@ MaterialInstance *RenderResource::CreateMaterialInstance(const OSString &mtl_fil
return CreateMaterialInstance(mtl,vil_cfg); return CreateMaterialInstance(mtl,vil_cfg);
} }
MaterialInstance *RenderResource::CreateMaterialInstance(const MaterialCreateInfo *mci,const VILConfig *vil_cfg) MaterialInstance *RenderResource::CreateMaterialInstance(const mtl::MaterialCreateInfo *mci,const VILConfig *vil_cfg)
{ {
Material *mtl=this->CreateMaterial(mci); Material *mtl=this->CreateMaterial(mci);

2
src/SceneGraph/Vulkan/VKRenderResourceMaterial.cpp
View File

@ -199,7 +199,7 @@ Material *RenderResource::CreateMaterial(const OSString &filename)
return(mtl); return(mtl);
} }
Material *RenderResource::CreateMaterial(const MaterialCreateInfo *mci) Material *RenderResource::CreateMaterial(const mtl::MaterialCreateInfo *mci)
{ {
if(!mci) if(!mci)
return(nullptr); return(nullptr);

2
src/ShaderGen/2d/VertexColor2D.cpp
View File

@ -3,7 +3,7 @@
#include<hgl/graph/VKMaterial.h> #include<hgl/graph/VKMaterial.h>
#include<hgl/graph/VKDevice.h> #include<hgl/graph/VKDevice.h>
#include<hgl/shadergen/MaterialCreateInfo.h> #include<hgl/shadergen/MaterialCreateInfo.h>
#include"common/UBOCommon.h" #include<hgl/graph/mtl/UBOCommon.h>
#include"common/MFCommon.h" #include"common/MFCommon.h"
STD_MTL_NAMESPACE_BEGIN STD_MTL_NAMESPACE_BEGIN

8
src/ShaderGen/CMakeLists.txt
View File

@ -34,16 +34,16 @@ SET(GLSL_COMPILER_SOURCE GLSLCompiler.h
SOURCE_GROUP("GLSL Compiler" FILES ${GLSL_COMPILER_SOURCE}) SOURCE_GROUP("GLSL Compiler" FILES ${GLSL_COMPILER_SOURCE})
set(STD_MTL_HEADER_PATH ${ROOT_INCLUDE_PATH}/hgl/graph/mtl)
SET(SHADERGEN_COMMON_FILES common/UBOCommon.h SET(SHADERGEN_COMMON_FILES ${STD_MTL_HEADER_PATH}/UBOCommon.h
common/MFCommon.h) common/MFCommon.h
common/MFGetPosition.h)
SOURCE_GROUP("Common" FILES ${SHADERGEN_COMMON_FILES}) SOURCE_GROUP("Common" FILES ${SHADERGEN_COMMON_FILES})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR})
set(STD_MTL_HEADER_PATH ${ROOT_INCLUDE_PATH}/hgl/graph/mtl)
SET(STD_MTL_2D_HEADER_PATH ${STD_MTL_HEADER_PATH}/2d) SET(STD_MTL_2D_HEADER_PATH ${STD_MTL_HEADER_PATH}/2d)
SET(STD_MTL_2D_SOURCE_FILES ${STD_MTL_2D_HEADER_PATH}/Material2DConfig.h SET(STD_MTL_2D_SOURCE_FILES ${STD_MTL_2D_HEADER_PATH}/Material2DConfig.h