Update shader to use new render resource system
This commit is contained in:
@@ -277,6 +277,7 @@ namespace OpenVulkano::Vulkan
|
||||
find_if(shaders.begin(), shaders.end(),
|
||||
[&](auto& obj){ return obj.get() == shader; }
|
||||
);
|
||||
object->get()->owner = nullptr;
|
||||
shaders.erase(object);
|
||||
}
|
||||
|
||||
@@ -308,9 +309,8 @@ namespace OpenVulkano::Vulkan
|
||||
VulkanShader* ResourceManager::CreateShader(Scene::Shader* shader)
|
||||
{
|
||||
const std::unique_lock lock(mutex);
|
||||
if (shader->renderShader) return static_cast<VulkanShader*>(shader->renderShader);
|
||||
VulkanShader* vkShader = new VulkanShader();
|
||||
vkShader->Init(context, shader, this);
|
||||
if (shader->HasRenderResource()) return static_cast<VulkanShader*>(shader->GetRenderResource());
|
||||
VulkanShader* vkShader = new VulkanShader(context, shader, this);
|
||||
shaders.emplace_back(vkShader);
|
||||
return vkShader;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user