fix: prevent selection outline crash on first selection
This commit is contained in:
@@ -17,6 +17,7 @@
|
||||
|
||||
#include <array>
|
||||
#include <cstdint>
|
||||
#include <optional>
|
||||
#include <vector>
|
||||
|
||||
namespace XCEngine {
|
||||
@@ -31,7 +32,12 @@ struct ObjectIdOutlineStyle {
|
||||
|
||||
class BuiltinObjectIdOutlinePass {
|
||||
public:
|
||||
BuiltinObjectIdOutlinePass();
|
||||
~BuiltinObjectIdOutlinePass() = default;
|
||||
BuiltinObjectIdOutlinePass(const BuiltinObjectIdOutlinePass&) = delete;
|
||||
BuiltinObjectIdOutlinePass& operator=(const BuiltinObjectIdOutlinePass&) = delete;
|
||||
BuiltinObjectIdOutlinePass(BuiltinObjectIdOutlinePass&&) = delete;
|
||||
BuiltinObjectIdOutlinePass& operator=(BuiltinObjectIdOutlinePass&&) = delete;
|
||||
|
||||
static constexpr uint32_t kMaxSelectedObjectCount = 256u;
|
||||
|
||||
@@ -55,6 +61,8 @@ private:
|
||||
bool EnsureInitialized(const RenderContext& renderContext);
|
||||
bool CreateResources(const RenderContext& renderContext);
|
||||
void DestroyResources();
|
||||
bool HasCreatedResources() const;
|
||||
void ResetState();
|
||||
|
||||
RHI::RHIDevice* m_device = nullptr;
|
||||
RHI::RHIType m_backendType = RHI::RHIType::D3D12;
|
||||
@@ -64,7 +72,7 @@ private:
|
||||
RHI::RHIDescriptorSet* m_constantSet = nullptr;
|
||||
RHI::RHIDescriptorPool* m_texturePool = nullptr;
|
||||
RHI::RHIDescriptorSet* m_textureSet = nullptr;
|
||||
Resources::ResourceHandle<Resources::Shader> m_builtinObjectIdOutlineShader;
|
||||
std::optional<Resources::ResourceHandle<Resources::Shader>> m_builtinObjectIdOutlineShader;
|
||||
};
|
||||
|
||||
} // namespace Passes
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
#include "Resources/BuiltinResources.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <utility>
|
||||
|
||||
namespace XCEngine {
|
||||
namespace Rendering {
|
||||
@@ -85,6 +86,10 @@ RHI::GraphicsPipelineDesc CreatePipelineDesc(
|
||||
|
||||
} // namespace
|
||||
|
||||
BuiltinObjectIdOutlinePass::BuiltinObjectIdOutlinePass() {
|
||||
ResetState();
|
||||
}
|
||||
|
||||
void BuiltinObjectIdOutlinePass::Shutdown() {
|
||||
DestroyResources();
|
||||
}
|
||||
@@ -181,7 +186,9 @@ bool BuiltinObjectIdOutlinePass::EnsureInitialized(const RenderContext& renderCo
|
||||
return true;
|
||||
}
|
||||
|
||||
if (HasCreatedResources()) {
|
||||
DestroyResources();
|
||||
}
|
||||
return CreateResources(renderContext);
|
||||
}
|
||||
|
||||
@@ -190,21 +197,23 @@ bool BuiltinObjectIdOutlinePass::CreateResources(const RenderContext& renderCont
|
||||
return false;
|
||||
}
|
||||
|
||||
m_device = renderContext.device;
|
||||
m_backendType = renderContext.backendType;
|
||||
m_builtinObjectIdOutlineShader = Resources::ResourceManager::Get().Load<Resources::Shader>(
|
||||
Resources::ResourceHandle<Resources::Shader> shader = Resources::ResourceManager::Get().Load<Resources::Shader>(
|
||||
Resources::GetBuiltinObjectIdOutlineShaderPath());
|
||||
if (!m_builtinObjectIdOutlineShader.IsValid()) {
|
||||
if (!shader.IsValid()) {
|
||||
Debug::Logger::Get().Error(
|
||||
Debug::LogCategory::Rendering,
|
||||
"BuiltinObjectIdOutlinePass failed to load builtin object-id-outline shader resource");
|
||||
DestroyResources();
|
||||
ResetState();
|
||||
return false;
|
||||
}
|
||||
|
||||
m_device = renderContext.device;
|
||||
m_backendType = renderContext.backendType;
|
||||
m_builtinObjectIdOutlineShader.emplace(std::move(shader));
|
||||
|
||||
const Resources::ShaderBackend backend = ::XCEngine::Rendering::Detail::ToShaderBackend(m_backendType);
|
||||
const Resources::ShaderPass* outlinePass =
|
||||
FindObjectIdOutlineCompatiblePass(*m_builtinObjectIdOutlineShader.Get(), backend);
|
||||
FindObjectIdOutlineCompatiblePass(*m_builtinObjectIdOutlineShader->Get(), backend);
|
||||
if (outlinePass == nullptr) {
|
||||
Debug::Logger::Get().Error(
|
||||
Debug::LogCategory::Rendering,
|
||||
@@ -278,7 +287,7 @@ bool BuiltinObjectIdOutlinePass::CreateResources(const RenderContext& renderCont
|
||||
CreatePipelineDesc(
|
||||
m_backendType,
|
||||
m_pipelineLayout,
|
||||
*m_builtinObjectIdOutlineShader.Get(),
|
||||
*m_builtinObjectIdOutlineShader->Get(),
|
||||
outlinePass->name));
|
||||
if (m_pipelineState == nullptr || !m_pipelineState->IsValid()) {
|
||||
DestroyResources();
|
||||
@@ -288,6 +297,17 @@ bool BuiltinObjectIdOutlinePass::CreateResources(const RenderContext& renderCont
|
||||
return true;
|
||||
}
|
||||
|
||||
bool BuiltinObjectIdOutlinePass::HasCreatedResources() const {
|
||||
return m_device != nullptr ||
|
||||
m_pipelineLayout != nullptr ||
|
||||
m_pipelineState != nullptr ||
|
||||
m_constantPool != nullptr ||
|
||||
m_constantSet != nullptr ||
|
||||
m_texturePool != nullptr ||
|
||||
m_textureSet != nullptr ||
|
||||
m_builtinObjectIdOutlineShader.has_value();
|
||||
}
|
||||
|
||||
void BuiltinObjectIdOutlinePass::DestroyResources() {
|
||||
if (m_pipelineState != nullptr) {
|
||||
m_pipelineState->Shutdown();
|
||||
@@ -325,9 +345,23 @@ void BuiltinObjectIdOutlinePass::DestroyResources() {
|
||||
m_pipelineLayout = nullptr;
|
||||
}
|
||||
|
||||
if (m_builtinObjectIdOutlineShader.has_value()) {
|
||||
m_builtinObjectIdOutlineShader.reset();
|
||||
}
|
||||
|
||||
ResetState();
|
||||
}
|
||||
|
||||
void BuiltinObjectIdOutlinePass::ResetState() {
|
||||
m_device = nullptr;
|
||||
m_backendType = RHI::RHIType::D3D12;
|
||||
m_builtinObjectIdOutlineShader.Reset();
|
||||
m_pipelineLayout = nullptr;
|
||||
m_pipelineState = nullptr;
|
||||
m_constantPool = nullptr;
|
||||
m_constantSet = nullptr;
|
||||
m_texturePool = nullptr;
|
||||
m_textureSet = nullptr;
|
||||
m_builtinObjectIdOutlineShader.reset();
|
||||
}
|
||||
|
||||
} // namespace Passes
|
||||
|
||||
Reference in New Issue
Block a user