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

removed GPUDevice::CreateMP(Material *,const DescriptorSetType &)

Browse Source
This commit is contained in:
HuYingzhuo(hugo/hyzboy) 2023-06-06 20:52:23 +08:00
parent ffaa6b5362
commit 1a8bd0a607
4 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMCore

@ -1 +1 @@
Subproject commit 215494ead2c3e2b60191f6f77d1648d6a466f93f Subproject commit 97422170df154a9e3067c6e129b01d196e7fa265

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

@ -210,7 +210,6 @@ public: //
public: //shader & material public: //shader & material
MaterialParameters *CreateMP(const MaterialDescriptorManager *,const PipelineLayoutData *,const DescriptorSetType &); MaterialParameters *CreateMP(const MaterialDescriptorManager *,const PipelineLayoutData *,const DescriptorSetType &);
MaterialParameters *CreateMP(Material *,const DescriptorSetType &);
ShaderModule *CreateShaderModule(VkShaderStageFlagBits,const uint32_t *,const size_t); ShaderModule *CreateShaderModule(VkShaderStageFlagBits,const uint32_t *,const size_t);

3
inc/hgl/graph/VKMaterial.h
View File

@ -4,7 +4,6 @@
#include<hgl/graph/VK.h> #include<hgl/graph/VK.h>
#include<hgl/type/Map.h> #include<hgl/type/Map.h>
#include<hgl/type/String.h> #include<hgl/type/String.h>
#include<hgl/type/Collection.h>
#include<hgl/graph/VKShaderModuleMap.h> #include<hgl/graph/VKShaderModuleMap.h>
#include<hgl/graph/VKDescriptorSetType.h> #include<hgl/graph/VKDescriptorSetType.h>
VK_NAMESPACE_BEGIN VK_NAMESPACE_BEGIN
@ -43,8 +42,6 @@ class Material
{ {
MaterialData *data; MaterialData *data;
Collection *mi_data;
private: private:
friend GPUDevice; friend GPUDevice;

7
src/SceneGraph/Vulkan/VKDeviceMaterial.cpp
View File

@ -75,13 +75,6 @@ MaterialParameters *GPUDevice::CreateMP(const MaterialDescriptorManager *desc_ma
return(new MaterialParameters(desc_manager,desc_set_type,ds)); return(new MaterialParameters(desc_manager,desc_set_type,ds));
} }
MaterialParameters *GPUDevice::CreateMP(Material *mtl,const DescriptorSetType &desc_set_type)
{
if(!mtl)return(nullptr);
return CreateMP(mtl->GetDescriptorSets(),mtl->GetPipelineLayoutData(),desc_set_type);
}
Material *GPUDevice::CreateMaterial(const UTF8String &mtl_name,ShaderModuleMap *shader_maps,MaterialDescriptorManager *desc_manager,VertexInput *vi) Material *GPUDevice::CreateMaterial(const UTF8String &mtl_name,ShaderModuleMap *shader_maps,MaterialDescriptorManager *desc_manager,VertexInput *vi)
{ {
const int shader_count=shader_maps->GetCount(); const int shader_count=shader_maps->GetCount();