GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some shader issues

Browse Source
This commit is contained in:
Georg Hagen
2024-07-03 15:43:15 +02:00
parent 9e95285173
commit 002206e9d6
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openVulkanoCpp/Scene/Drawable.hpp
View File

@@ -39,7 +39,7 @@ namespace OpenVulkano::Scene
const DrawPhase phase = DrawPhase::MAIN)
: m_encoder(encoder), m_drawPhase(phase) {}
~Drawable() override { if (m_scene) Drawable::Close(); }
~Drawable() override {/* if (m_scene) Drawable::Close();*/ }
void Close() override;

2
openVulkanoCpp/Scene/SimpleDrawable.hpp
View File

@@ -32,7 +32,7 @@ namespace OpenVulkano::Scene
~SimpleDrawable()
{
if (m_mesh) SimpleDrawable::Close();
//if (m_mesh) SimpleDrawable::Close();
}
void Init(Shader* shader, Geometry* mesh, Material* material);

1
openVulkanoCpp/Vulkan/Resources/ResourceManager.cpp
View File

@@ -242,6 +242,7 @@ namespace OpenVulkano::Vulkan
void ResourceManager::RemoveShader(VulkanShader* shader)
{
if (!cmdPools) return;
const std::unique_lock lock(mutex);
std::vector<std::unique_ptr<VulkanShader>>::iterator object =
find_if(shaders.begin(), shaders.end(),

21
openVulkanoCpp/Vulkan/Scene/VulkanShader.cpp
View File

@@ -17,14 +17,7 @@ namespace OpenVulkano::Vulkan
VulkanShader::~VulkanShader()
{
if (!shader) return;
device.destroyPipeline(pipeline);
for(auto& shaderModule : shaderModules)
{
device.destroyShaderModule(shaderModule);
}
device.destroyPipelineLayout(pipelineLayout);
for(auto& descriptorSetLayout : descriptorSetLayouts)
device.destroyDescriptorSetLayout(descriptorSetLayout);
Close();
}
void VulkanShader::Init(Context* context, Scene::Shader* shader, IShaderOwner* owner)
@@ -124,7 +117,17 @@ namespace OpenVulkano::Vulkan
void VulkanShader::Close()
{
owner->RemoveShader(this);
shader->renderShader = nullptr;
device.destroyPipeline(pipeline);
for(auto& shaderModule : shaderModules)
{
device.destroyShaderModule(shaderModule);
}
device.destroyPipelineLayout(pipelineLayout);
for(auto& descriptorSetLayout : descriptorSetLayouts)
device.destroyDescriptorSetLayout(descriptorSetLayout);
shader = nullptr;
if (owner) owner->RemoveShader(this);
}
void VulkanShader::CreatePipelineLayout()