diff --git a/CMCore b/CMCore index 215494ea..97422170 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 215494ead2c3e2b60191f6f77d1648d6a466f93f +Subproject commit 97422170df154a9e3067c6e129b01d196e7fa265 diff --git a/inc/hgl/graph/VKDevice.h b/inc/hgl/graph/VKDevice.h index 02b5772d..e838bf8b 100644 --- a/inc/hgl/graph/VKDevice.h +++ b/inc/hgl/graph/VKDevice.h @@ -210,7 +210,6 @@ public: // public: //shader & material MaterialParameters *CreateMP(const MaterialDescriptorManager *,const PipelineLayoutData *,const DescriptorSetType &); - MaterialParameters *CreateMP(Material *,const DescriptorSetType &); ShaderModule *CreateShaderModule(VkShaderStageFlagBits,const uint32_t *,const size_t); diff --git a/inc/hgl/graph/VKMaterial.h b/inc/hgl/graph/VKMaterial.h index 6e2284b0..5dcbc5b1 100644 --- a/inc/hgl/graph/VKMaterial.h +++ b/inc/hgl/graph/VKMaterial.h @@ -4,7 +4,6 @@ #include #include #include -#include #include #include VK_NAMESPACE_BEGIN @@ -43,8 +42,6 @@ class Material { MaterialData *data; - Collection *mi_data; - private: friend GPUDevice; diff --git a/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp b/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp index 1e9a72f6..0b1b7007 100644 --- a/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp +++ b/src/SceneGraph/Vulkan/VKDeviceMaterial.cpp @@ -75,13 +75,6 @@ MaterialParameters *GPUDevice::CreateMP(const MaterialDescriptorManager *desc_ma 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) { const int shader_count=shader_maps->GetCount();