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

GPUDeviceAttribute更名为VkDevAttr

Browse Source
This commit is contained in:
hyzboy 2025-05-17 20:13:23 +08:00
parent 2dd60fee7f
commit 29aa76a917
35 changed files with 70 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/hgl/WorkObject.h
View File

@ -37,7 +37,7 @@ namespace hgl
graph::RenderFramework * GetRenderFramework (){return render_framework;}
graph::GPUDevice * GetDevice (){return render_framework->GetDevice();}
graph::GPUDeviceAttribute * GetDeviceAttribute (){return render_framework->GetDeviceAttribute();}
graph::VkDevAttr * GetDeviceAttribute (){return render_framework->GetDeviceAttribute();}
const VkExtent2D & GetExtent2D (){return cur_render_target->GetExtent();}

2
inc/hgl/graph/RenderFramework.h
View File

@ -53,7 +53,7 @@ public:
GPUDevice * GetDevice ()const{return device;}
VkDevice GetVkDevice ()const{return device->GetDevice();}
const GPUPhysicalDevice * GetPhysicalDevice ()const{return device->GetPhysicalDevice();}
GPUDeviceAttribute * GetDeviceAttribute ()const{return device->GetDeviceAttribute();}
VkDevAttr * GetDeviceAttribute ()const{return device->GetDeviceAttribute();}
RenderResource * GetRenderResource ()const{return render_resource;}

2
inc/hgl/graph/VK.h
View File

@ -43,7 +43,7 @@ class RenderFramework;
class VulkanInstance;
class GPUPhysicalDevice;
class GPUDevice;
struct GPUDeviceAttribute;
struct VkDevAttr;
class DeviceQueue;
class ImageView;
class Framebuffer;

8
inc/hgl/graph/VKCommandBuffer.h
View File

@ -12,7 +12,7 @@ class GPUCmdBuffer
{
protected:
const GPUDeviceAttribute *dev_attr;
const VkDevAttr *dev_attr;
VkCommandBuffer cmd_buf;
@ -20,7 +20,7 @@ protected:
public:
GPUCmdBuffer(const GPUDeviceAttribute *attr,VkCommandBuffer cb);
GPUCmdBuffer(const VkDevAttr *attr,VkCommandBuffer cb);
virtual ~GPUCmdBuffer();
operator VkCommandBuffer(){return cmd_buf;}
@ -70,7 +70,7 @@ private:
public:
RenderCmdBuffer(const GPUDeviceAttribute *attr,VkCommandBuffer cb);
RenderCmdBuffer(const VkDevAttr *attr,VkCommandBuffer cb);
~RenderCmdBuffer();
void SetDescriptorBinding(DescriptorBinding *db) { desc_binding=db; }
@ -264,7 +264,7 @@ class TextureCmdBuffer:public GPUCmdBuffer
public:
TextureCmdBuffer(const GPUDeviceAttribute *attr,VkCommandBuffer cb):GPUCmdBuffer(attr,cb)
TextureCmdBuffer(const VkDevAttr *attr,VkCommandBuffer cb):GPUCmdBuffer(attr,cb)
{
imageMemoryBarrier.sType=VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
imageMemoryBarrier.pNext=nullptr;

10
inc/hgl/graph/VKDevice.h
View File

@ -1,5 +1,4 @@
#ifndef HGL_GRAPH_VULKAN_DEVICE_INCLUDE
#define HGL_GRAPH_VULKAN_DEVICE_INCLUDE
#pragma once
#include<hgl/type/ArrayList.h>
#include<hgl/type/String.h>
@ -30,7 +29,7 @@ struct CopyBufferToImageInfo;
class GPUDevice
{
GPUDeviceAttribute *attr;
VkDevAttr *attr;
private:
@ -40,14 +39,14 @@ private:
friend class VulkanDeviceCreater;
GPUDevice(GPUDeviceAttribute *da);
GPUDevice(VkDevAttr *da);
public:
virtual ~GPUDevice();
operator VkDevice () {return attr->device;}
GPUDeviceAttribute *GetDeviceAttribute () {return attr;}
VkDevAttr *GetDeviceAttribute () {return attr;}
VkSurfaceKHR GetSurface () {return attr->surface;}
VkDevice GetDevice ()const {return attr->device;}
@ -175,4 +174,3 @@ public:
TileFont *CreateTileFont(FontSource *fs,int limit_count=-1); ///<创建一个Tile字体
};//class GPUDevice
VK_NAMESPACE_END
#endif//HGL_GRAPH_VULKAN_DEVICE_INCLUDE

8
inc/hgl/graph/VKDeviceAttribute.h
View File

@ -11,7 +11,7 @@ VK_NAMESPACE_BEGIN
constexpr uint32_t ERROR_FAMILY_INDEX=UINT32_MAX;
struct GPUDeviceAttribute
struct VkDevAttr
{
VulkanInstance * instance =nullptr;
const GPUPhysicalDevice * physical_device =nullptr;
@ -55,8 +55,8 @@ struct GPUDeviceAttribute
public:
GPUDeviceAttribute(VulkanInstance *inst,const GPUPhysicalDevice *pd,VkSurfaceKHR s);
~GPUDeviceAttribute();
VkDevAttr(VulkanInstance *inst,const GPUPhysicalDevice *pd,VkSurfaceKHR s);
~VkDevAttr();
int GetMemoryType(uint32_t typeBits,VkMemoryPropertyFlags properties) const;
@ -75,5 +75,5 @@ public:
{
return instance->GetDeviceProc<T>(device,name);
}
};//class GPUDeviceAttribute
};//class VkDevAttr
VK_NAMESPACE_END

2
inc/hgl/graph/module/GraphModule.h
View File

@ -19,7 +19,7 @@ public:
GPUDevice * GetDevice (); ///<取得GPU设备
VkDevice GetVkDevice ()const; ///<取得VkDevice
const GPUPhysicalDevice * GetPhysicalDevice ()const; ///<取得物理设备
GPUDeviceAttribute *GetDeviceAttribute ()const; ///<取得设备属性
VkDevAttr *GetDeviceAttribute ()const; ///<取得设备属性
VkPipelineCache GetPipelineCache ()const; ///<取得PipelineCache
public:

12
inc/hgl/graph/mtl/Material2DCreateConfig.h
View File

@ -52,13 +52,13 @@ public:
DEFINE_MATERIAL_FACTORY_CLASS(VertexColor2D,CreateVertexColor2D,const Material2DCreateConfig)
MaterialCreateInfo *CreatePureColor2D(const GPUDeviceAttribute *dev_attr,const Material2DCreateConfig *);
MaterialCreateInfo *CreatePureColor2D(const VkDevAttr *dev_attr,const Material2DCreateConfig *);
MaterialCreateInfo *CreateLerpLine2D(const GPUDeviceAttribute *dev_attr,const Material2DCreateConfig *);
MaterialCreateInfo *CreateLerpLine2D(const VkDevAttr *dev_attr,const Material2DCreateConfig *);
MaterialCreateInfo *CreatePureTexture2D(const GPUDeviceAttribute *dev_attr,const Material2DCreateConfig *);
MaterialCreateInfo *CreateRectTexture2D(const GPUDeviceAttribute *dev_attr,Material2DCreateConfig *);
MaterialCreateInfo *CreateRectTexture2DArray(const GPUDeviceAttribute *dev_attr,Material2DCreateConfig *);
MaterialCreateInfo *CreatePureTexture2D(const VkDevAttr *dev_attr,const Material2DCreateConfig *);
MaterialCreateInfo *CreateRectTexture2D(const VkDevAttr *dev_attr,Material2DCreateConfig *);
MaterialCreateInfo *CreateRectTexture2DArray(const VkDevAttr *dev_attr,Material2DCreateConfig *);
// 为什么有了LoadMaterialFromFile，还需要保留以上Create系列函数？
@ -72,6 +72,6 @@ MaterialCreateInfo *CreateRectTexture2DArray(const GPUDeviceAttribute *dev_attr,
* @param cfg 材质创建参数
* @return 材质创建信息
*/
MaterialCreateInfo *LoadMaterialFromFile(const GPUDeviceAttribute *dev_attr,const AnsiString &mtl_name,Material2DCreateConfig *cfg); ///<从文件加载材质
MaterialCreateInfo *LoadMaterialFromFile(const VkDevAttr *dev_attr,const AnsiString &mtl_name,Material2DCreateConfig *cfg); ///<从文件加载材质
STD_MTL_NAMESPACE_END

10
inc/hgl/graph/mtl/Material3DCreateConfig.h
View File

@ -50,10 +50,10 @@ public:
}
};//struct Material3DCreateConfig:public MaterialCreateConfig
MaterialCreateInfo *CreateVertexColor3D(const GPUDeviceAttribute *dev_attr,const Material3DCreateConfig *);
MaterialCreateInfo *CreateVertexLuminance3D(const GPUDeviceAttribute *dev_attr,const Material3DCreateConfig *);
MaterialCreateInfo *CreateVertexColor3D(const VkDevAttr *dev_attr,const Material3DCreateConfig *);
MaterialCreateInfo *CreateVertexLuminance3D(const VkDevAttr *dev_attr,const Material3DCreateConfig *);
MaterialCreateInfo *CreateMaterialGizmo3D(const GPUDeviceAttribute *dev_attr,const Material3DCreateConfig *cfg);
MaterialCreateInfo *CreateMaterialGizmo3D(const VkDevAttr *dev_attr,const Material3DCreateConfig *cfg);
struct BillboardMaterialCreateConfig:public Material3DCreateConfig
{
@ -66,7 +66,7 @@ public:
using Material3DCreateConfig::Material3DCreateConfig;
};
MaterialCreateInfo *CreateBillboard2D(const GPUDeviceAttribute *dev_attr,mtl::BillboardMaterialCreateConfig *);
MaterialCreateInfo *CreateBillboard2D(const VkDevAttr *dev_attr,mtl::BillboardMaterialCreateConfig *);
/**
* 从文件加载材质
@ -74,5 +74,5 @@ MaterialCreateInfo *CreateBillboard2D(const GPUDeviceAttribute *dev_attr,mtl::Bi
* @param cfg 材质创建参数
* @return 材质创建信息
*/
MaterialCreateInfo *LoadMaterialFromFile(const GPUDeviceAttribute *dev_attr,const AnsiString &name,Material3DCreateConfig *cfg);
MaterialCreateInfo *LoadMaterialFromFile(const VkDevAttr *dev_attr,const AnsiString &name,Material3DCreateConfig *cfg);
STD_MTL_NAMESPACE_END

12
inc/hgl/graph/mtl/MaterialLibrary.h
View File

@ -27,7 +27,7 @@ public:
//virtual const CoordinateSystem2D get2DCoordinateSystem()const=0;
virtual MaterialCreateInfo *Create(const GPUDeviceAttribute *dev_attr,MaterialCreateConfig *)=0;
virtual MaterialCreateInfo *Create(const VkDevAttr *dev_attr,MaterialCreateConfig *)=0;
};//class MaterialFactory
@ -45,7 +45,7 @@ public:
};//class RegistryMaterialFactoryClass
#define DEFINE_MATERIAL_FACTORY_CLASS(name,create_func,cfg_type) \
MaterialCreateInfo *Create##name(const GPUDeviceAttribute *dev_attr,cfg_type *); \
MaterialCreateInfo *Create##name(const VkDevAttr *dev_attr,cfg_type *); \
\
namespace \
{ \
@ -59,7 +59,7 @@ namespace \
return mtl_name; \
} \
\
MaterialCreateInfo *Create(const GPUDeviceAttribute *dev_attr,MaterialCreateConfig *cfg) override \
MaterialCreateInfo *Create(const VkDevAttr *dev_attr,MaterialCreateConfig *cfg) override \
{ \
return create_func(dev_attr,(cfg_type *)cfg); \
} \
@ -68,16 +68,16 @@ namespace \
static RegistryMaterialFactoryClass<MaterialFactory##name> MaterialFactoryInstance_##name; \
}
MaterialCreateInfo *CreateMaterialCreateInfo(const GPUDeviceAttribute *dev_attr,const MaterialName &,MaterialCreateConfig *cfg);
MaterialCreateInfo *CreateMaterialCreateInfo(const VkDevAttr *dev_attr,const MaterialName &,MaterialCreateConfig *cfg);
inline MaterialCreateInfo *CreateMaterialCreateInfo(const GPUDeviceAttribute *dev_attr,const char *mtl_name,MaterialCreateConfig *cfg)
inline MaterialCreateInfo *CreateMaterialCreateInfo(const VkDevAttr *dev_attr,const char *mtl_name,MaterialCreateConfig *cfg)
{
MaterialName mtl_id_name(mtl_name);
return CreateMaterialCreateInfo(dev_attr,mtl_id_name,cfg);
}
inline MaterialCreateInfo *CreateMaterialCreateInfo(const GPUDeviceAttribute *dev_attr,const AnsiString &mtl_name,MaterialCreateConfig *cfg)
inline MaterialCreateInfo *CreateMaterialCreateInfo(const VkDevAttr *dev_attr,const AnsiString &mtl_name,MaterialCreateConfig *cfg)
{
MaterialName mtl_id_name(mtl_name);

4
inc/hgl/graph/mtl/StdMaterial.h
View File

@ -19,7 +19,7 @@ namespace hgl::graph
class ShaderCreateInfoVertex;
class ShaderCreateInfoGeometry;
class ShaderCreateInfoFragment;
struct GPUDeviceAttribute;
struct VkDevAttr;
namespace mtl
{
@ -51,7 +51,7 @@ namespace hgl::graph
StdMaterial(const MaterialCreateConfig *);
virtual ~StdMaterial()=default;
virtual MaterialCreateInfo *Create(const GPUDeviceAttribute *dev_attr);
virtual MaterialCreateInfo *Create(const VkDevAttr *dev_attr);
};//class StdMaterial
}//namespace mtl
}//namespace hgl::graph

4
inc/hgl/shadergen/MaterialCreateInfo.h
View File

@ -12,7 +12,7 @@
namespace hgl::graph
{
struct GPUDeviceAttribute;
struct VkDevAttr;
struct UBODescriptor;
namespace mtl
@ -89,7 +89,7 @@ namespace hgl::graph
bool AddSampler(const VkShaderStageFlagBits flag_bits,const DescriptorSetType set_type,const SamplerType &st,const AnsiString &name);
bool CreateShader(const GPUDeviceAttribute *dev_attr);
bool CreateShader(const VkDevAttr *dev_attr);
};//class MaterialCreateInfo
}//namespace mtl
}//namespace hgl::graph

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

@ -2,7 +2,7 @@
#include<hgl/graph/VKDeviceAttribute.h>
VK_NAMESPACE_BEGIN
GPUCmdBuffer::GPUCmdBuffer(const GPUDeviceAttribute *attr,VkCommandBuffer cb)
GPUCmdBuffer::GPUCmdBuffer(const VkDevAttr *attr,VkCommandBuffer cb)
{
dev_attr=attr;
cmd_buf=cb;

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

@ -8,7 +8,7 @@
#include<hgl/graph/VKRenderTarget.h>
VK_NAMESPACE_BEGIN
RenderCmdBuffer::RenderCmdBuffer(const GPUDeviceAttribute *attr,VkCommandBuffer cb):GPUCmdBuffer(attr,cb)
RenderCmdBuffer::RenderCmdBuffer(const VkDevAttr *attr,VkCommandBuffer cb):GPUCmdBuffer(attr,cb)
{
cv_count=0;
clear_values=nullptr;

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

@ -3,7 +3,7 @@
#include<hgl/graph/VKCommandBuffer.h>
VK_NAMESPACE_BEGIN
GPUDevice::GPUDevice(GPUDeviceAttribute *da)
GPUDevice::GPUDevice(VkDevAttr *da)
{
attr=da;
}

12
src/SceneGraph/Vulkan/VKDeviceAttribute.cpp
View File

@ -7,7 +7,7 @@
VK_NAMESPACE_BEGIN
void SavePipelineCacheData(VkDevice device,VkPipelineCache cache,const VkPhysicalDeviceProperties &pdp);
GPUDeviceAttribute::GPUDeviceAttribute(VulkanInstance *inst,const GPUPhysicalDevice *pd,VkSurfaceKHR s)
VkDevAttr::VkDevAttr(VulkanInstance *inst,const GPUPhysicalDevice *pd,VkSurfaceKHR s)
{
instance=inst;
physical_device=pd;
@ -18,7 +18,7 @@ GPUDeviceAttribute::GPUDeviceAttribute(VulkanInstance *inst,const GPUPhysicalDev
GetQueueFamily();
}
GPUDeviceAttribute::~GPUDeviceAttribute()
VkDevAttr::~VkDevAttr()
{
#ifdef _DEBUG
if(debug_utils)
@ -44,12 +44,12 @@ GPUDeviceAttribute::~GPUDeviceAttribute()
instance->DestroySurface(surface);
}
int GPUDeviceAttribute::GetMemoryType(uint32_t typeBits,VkMemoryPropertyFlags properties) const
int VkDevAttr::GetMemoryType(uint32_t typeBits,VkMemoryPropertyFlags properties) const
{
return physical_device->GetMemoryType(typeBits,properties);
}
void GPUDeviceAttribute::RefreshSurfaceCaps()
void VkDevAttr::RefreshSurfaceCaps()
{
VkPhysicalDevice pdevice = *physical_device;
@ -80,7 +80,7 @@ void GPUDeviceAttribute::RefreshSurfaceCaps()
}
}
void GPUDeviceAttribute::GetSurfacePresentMode()
void VkDevAttr::GetSurfacePresentMode()
{
uint32_t mode_count;
@ -95,7 +95,7 @@ void GPUDeviceAttribute::GetSurfacePresentMode()
present_modes.Clear();
}
void GPUDeviceAttribute::GetQueueFamily()
void VkDevAttr::GetQueueFamily()
{
VkPhysicalDevice pdevice = *physical_device;

6
src/SceneGraph/Vulkan/VKDeviceCreater.cpp
View File

@ -117,7 +117,7 @@ namespace
#undef FEATURE_COPY
}
void GetDeviceQueue(GPUDeviceAttribute *attr)
void GetDeviceQueue(VkDevAttr *attr)
{
vkGetDeviceQueue(attr->device,attr->graphics_family,0,&attr->graphics_queue);
@ -295,9 +295,9 @@ void VulkanDeviceCreater::ChooseSurfaceFormat()
GPUDevice *VulkanDeviceCreater::CreateRenderDevice()
{
GPUDeviceAttribute *device_attr=new GPUDeviceAttribute(instance,physical_device,surface);
VkDevAttr *device_attr=new VkDevAttr(instance,physical_device,surface);
AutoDelete<GPUDeviceAttribute> auto_delete(device_attr);
AutoDelete<VkDevAttr> auto_delete(device_attr);
if(device_attr->graphics_family==ERROR_FAMILY_INDEX)
return(nullptr);

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

@ -183,8 +183,8 @@ Material *RenderResource::CreateMaterial(const mtl::MaterialCreateInfo *mci)
namespace mtl
{
MaterialCreateInfo *LoadMaterialFromFile(const GPUDeviceAttribute *dev_attr,const AnsiString &, Material2DCreateConfig *);
MaterialCreateInfo *LoadMaterialFromFile(const GPUDeviceAttribute *dev_attr,const AnsiString &, Material3DCreateConfig *);
MaterialCreateInfo *LoadMaterialFromFile(const VkDevAttr *dev_attr,const AnsiString &, Material2DCreateConfig *);
MaterialCreateInfo *LoadMaterialFromFile(const VkDevAttr *dev_attr,const AnsiString &, Material3DCreateConfig *);
}
Material *RenderResource::LoadMaterial(const AnsiString &mtl_name,mtl::Material2DCreateConfig *cfg)

2
src/SceneGraph/module/GraphModule.cpp
View File

@ -7,7 +7,7 @@ VK_NAMESPACE_BEGIN
GPUDevice * GraphModule::GetDevice () {return render_framework->GetDevice();}
VkDevice GraphModule::GetVkDevice ()const {return render_framework->GetVkDevice();}
const GPUPhysicalDevice * GraphModule::GetPhysicalDevice ()const {return render_framework->GetPhysicalDevice();}
GPUDeviceAttribute *GraphModule::GetDeviceAttribute ()const {return render_framework->GetDeviceAttribute();}
VkDevAttr *GraphModule::GetDeviceAttribute ()const {return render_framework->GetDeviceAttribute();}
VkPipelineCache GraphModule::GetPipelineCache ()const {return render_framework->GetDeviceAttribute()->pipeline_cache;}

4
src/SceneGraph/module/SwapchainModule.cpp
View File

@ -22,7 +22,7 @@ namespace
// return swapchain_extent;
//}
VkSwapchainKHR CreateVulkanSwapChain(const GPUDeviceAttribute *dev_attr)
VkSwapchainKHR CreateVulkanSwapChain(const VkDevAttr *dev_attr)
{
VkSwapchainCreateInfoKHR swapchain_ci;
@ -262,7 +262,7 @@ void SwapchainModule::OnResize(const VkExtent2D &extent)
{
SAFE_CLEAR(sc_render_target)
GPUDeviceAttribute *dev_attr=GetDeviceAttribute();
VkDevAttr *dev_attr=GetDeviceAttribute();
dev_attr->RefreshSurfaceCaps();

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

@ -63,7 +63,7 @@ void main()
};//class MaterialPureColor2D:public Std2DMaterial
}//namespace
MaterialCreateInfo *CreatePureColor2D(const GPUDeviceAttribute *dev_attr,const Material2DCreateConfig *cfg)
MaterialCreateInfo *CreatePureColor2D(const VkDevAttr *dev_attr,const Material2DCreateConfig *cfg)
{
MaterialPureColor2D mpc2d(cfg);

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

@ -55,7 +55,7 @@ void main()
};//class MaterialPureTexture2D:public Std2DMaterial
}//namespace
MaterialCreateInfo *CreatePureTexture2D(const GPUDeviceAttribute *dev_attr,const mtl::Material2DCreateConfig *cfg)
MaterialCreateInfo *CreatePureTexture2D(const VkDevAttr *dev_attr,const mtl::Material2DCreateConfig *cfg)
{
MaterialPureTexture2D mvc2d(cfg);

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

@ -82,7 +82,7 @@ void main()
};//class MaterialRectTexture2D:public Std2DMaterial
}//namespace
MaterialCreateInfo *CreateRectTexture2D(const GPUDeviceAttribute *dev_attr,mtl::Material2DCreateConfig *cfg)
MaterialCreateInfo *CreateRectTexture2D(const VkDevAttr *dev_attr,mtl::Material2DCreateConfig *cfg)
{
if(!cfg)
return(nullptr);

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

@ -98,7 +98,7 @@ void main()
};//class MaterialRectTexture2D:public Std2DMaterial
}//namespace
MaterialCreateInfo *CreateRectTexture2DArray(const GPUDeviceAttribute *dev_attr,mtl::Material2DCreateConfig *cfg)
MaterialCreateInfo *CreateRectTexture2DArray(const VkDevAttr *dev_attr,mtl::Material2DCreateConfig *cfg)
{
if(!cfg)
return(nullptr);

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

@ -54,7 +54,7 @@ void main()
};//class MaterialVertexColor2D:public Std2DMaterial
}//namespace
MaterialCreateInfo *CreateVertexColor2D(const GPUDeviceAttribute *dev_attr,const Material2DCreateConfig *cfg)
MaterialCreateInfo *CreateVertexColor2D(const VkDevAttr *dev_attr,const Material2DCreateConfig *cfg)
{
MaterialVertexColor2D mvc2d(cfg);

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

@ -102,7 +102,7 @@ namespace
material_file::MaterialFileData *LoadMaterialDataFromFile(const AnsiString &mtl_filename);
MaterialCreateInfo *LoadMaterialFromFile(const GPUDeviceAttribute *dev_attr,const AnsiString &name,Material2DCreateConfig *cfg)
MaterialCreateInfo *LoadMaterialFromFile(const VkDevAttr *dev_attr,const AnsiString &name,Material2DCreateConfig *cfg)
{
if(name.IsEmpty()||!cfg)
return(nullptr);

2
src/ShaderGen/3d/M_BillboardDynamicSize.cpp
View File

@ -86,7 +86,7 @@ void main()
};//class MaterialBillboard2DDynamicSize:public Std3DMaterial
}//namespace
MaterialCreateInfo *CreateBillboard2DDynamic(const GPUDeviceAttribute *dev_attr,mtl::BillboardMaterialCreateConfig *cfg)
MaterialCreateInfo *CreateBillboard2DDynamic(const VkDevAttr *dev_attr,mtl::BillboardMaterialCreateConfig *cfg)
{
if(!cfg)
return(nullptr);

2
src/ShaderGen/3d/M_BillboardFixedSize.cpp
View File

@ -96,7 +96,7 @@ void main()
};//class MaterialBillboard2DFixedSize:public Std3DMaterial
}//namespace
MaterialCreateInfo *CreateBillboard2DFixedSize(const GPUDeviceAttribute *dev_attr,mtl::BillboardMaterialCreateConfig *cfg)
MaterialCreateInfo *CreateBillboard2DFixedSize(const VkDevAttr *dev_attr,mtl::BillboardMaterialCreateConfig *cfg)
{
if(!cfg)
return(nullptr);

2
src/ShaderGen/3d/M_Gizmo3D.cpp
View File

@ -93,7 +93,7 @@ void main()
};//class MaterialGizmo3D:public Std3DMaterial
}//namespace
MaterialCreateInfo *CreateMaterialGizmo3D(const GPUDeviceAttribute *dev_attr,const Material3DCreateConfig *cfg)
MaterialCreateInfo *CreateMaterialGizmo3D(const VkDevAttr *dev_attr,const Material3DCreateConfig *cfg)
{
MaterialGizmo3D mg3d(cfg);

2
src/ShaderGen/3d/M_VertexColor3D.cpp
View File

@ -54,7 +54,7 @@ void main()
};//class MaterialVertexColor3D:public Std3DMaterial
}//namespace
MaterialCreateInfo *CreateVertexColor3D(const GPUDeviceAttribute *dev_attr,const Material3DCreateConfig *cfg)
MaterialCreateInfo *CreateVertexColor3D(const VkDevAttr *dev_attr,const Material3DCreateConfig *cfg)
{
MaterialVertexColor3D mvc3d(cfg);

2
src/ShaderGen/3d/M_VertexLum3D.cpp
View File

@ -68,7 +68,7 @@ void main()
};//class MaterialVertexLuminance3D:public Std3DMaterial
}//namespace
MaterialCreateInfo *CreateVertexLuminance3D(const GPUDeviceAttribute *dev_attr,const Material3DCreateConfig *cfg)
MaterialCreateInfo *CreateVertexLuminance3D(const VkDevAttr *dev_attr,const Material3DCreateConfig *cfg)
{
MaterialVertexLuminance3D mvc3d(cfg);

2
src/ShaderGen/3d/Std3DMaterialLoader.cpp
View File

@ -103,7 +103,7 @@ namespace
material_file::MaterialFileData *LoadMaterialDataFromFile(const AnsiString &mtl_filename);
MaterialCreateInfo *LoadMaterialFromFile(const GPUDeviceAttribute *dev_attr,const AnsiString &name,Material3DCreateConfig *cfg)
MaterialCreateInfo *LoadMaterialFromFile(const VkDevAttr *dev_attr,const AnsiString &name,Material3DCreateConfig *cfg)
{
if(name.IsEmpty()||!cfg)
return (nullptr);

2
src/ShaderGen/MaterialCreateInfo.cpp
View File

@ -225,7 +225,7 @@ bool MaterialCreateInfo::SetLocalToWorld(const uint32_t shader_stage_flag_bits)
return(true);
}
bool MaterialCreateInfo::CreateShader(const GPUDeviceAttribute *dev_attr)
bool MaterialCreateInfo::CreateShader(const VkDevAttr *dev_attr)
{
if(shader_map.IsEmpty())
return(false);

2
src/ShaderGen/MaterialLibrary.cpp
View File

@ -46,7 +46,7 @@ void ClearMaterialFactory()
SAFE_CLEAR(material_factory_map);
}
MaterialCreateInfo *CreateMaterialCreateInfo(const GPUDeviceAttribute *dev_attr,const MaterialName &name,MaterialCreateConfig *cfg)
MaterialCreateInfo *CreateMaterialCreateInfo(const VkDevAttr *dev_attr,const MaterialName &name,MaterialCreateConfig *cfg)
{
if(!cfg)
return(nullptr);

2
src/ShaderGen/StandardMaterial.cpp
View File

@ -8,7 +8,7 @@ StdMaterial::StdMaterial(const MaterialCreateConfig *mcc)
mci=new MaterialCreateInfo(mcc);
}
MaterialCreateInfo *StdMaterial::Create(const GPUDeviceAttribute *dev_attr)
MaterialCreateInfo *StdMaterial::Create(const VkDevAttr *dev_attr)
{
if(!BeginCustomShader())
return(nullptr);