From 228fafbbbbf8e10b623272d1a0d5d40cd50d508c Mon Sep 17 00:00:00 2001 From: ouczbs Date: Fri, 24 May 2024 22:58:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9A=82=E6=97=B6=E8=BF=98?= =?UTF-8?q?=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/engine/editor/IDE.h | 2 +- ...Window_DisplayComponentInnerSpecializations.cpp | 4 ++-- src/engine/editorstatic/DescriptorPoolManager.cpp | 4 ++-- src/engine/game/AddSystems.cpp | 1 - src/engine/idk/res/ResourceHandle.inl | 2 +- src/engine/vkn/ShaderModule.cpp | 5 ----- src/engine/vkn/VknMeshModder.cpp | 4 ---- src/engine/vkn/VknRenderTargetFactory.cpp | 14 ++++++-------- 8 files changed, 12 insertions(+), 24 deletions(-) diff --git a/src/engine/editor/IDE.h b/src/engine/editor/IDE.h index 764735c..1b6c6f8 100644 --- a/src/engine/editor/IDE.h +++ b/src/engine/editor/IDE.h @@ -21,7 +21,7 @@ Accessible through Core::GetSystem() [#include ] #include #include #include -//#include "windows/IGE_IWindow.h" + #undef FindWindow namespace idk diff --git a/src/engine/editor/windows/IGE_InspectorWindow_DisplayComponentInnerSpecializations.cpp b/src/engine/editor/windows/IGE_InspectorWindow_DisplayComponentInnerSpecializations.cpp index 92a000a..03dcd53 100644 --- a/src/engine/editor/windows/IGE_InspectorWindow_DisplayComponentInnerSpecializations.cpp +++ b/src/engine/editor/windows/IGE_InspectorWindow_DisplayComponentInnerSpecializations.cpp @@ -176,11 +176,11 @@ namespace idk ImGui::TextDisabled("Values driven by Canvas."); return; } - /*if (c_rt->GetGameObject()->HasComponent()) + if (c_rt->GetGameObject()->HasComponent()) { ImGui::TextDisabled("Values driven by AspectRatioFitter."); return; - }*/ + } const float region_width = ImGui::GetWindowContentRegionWidth(); diff --git a/src/engine/editorstatic/DescriptorPoolManager.cpp b/src/engine/editorstatic/DescriptorPoolManager.cpp index 04a2470..36d729c 100644 --- a/src/engine/editorstatic/DescriptorPoolManager.cpp +++ b/src/engine/editorstatic/DescriptorPoolManager.cpp @@ -34,7 +34,7 @@ namespace vknu ,hlp::arr_count(pool_size) ,std::data(pool_size) }; - pool = device.createDescriptorPoolUnique(create_info, nullptr, vk::DispatchLoaderStatic{}); + pool = device.createDescriptorPoolUnique(create_info, nullptr, vk::DispatchLoaderDefault{}); } DescriptorPoolsManager::DescriptorPoolsManager(VkDevice device) : _device{device} { @@ -51,7 +51,7 @@ namespace vknu void DescriptorPoolsManager::ResetManager(Manager& manager) { vk::Device d = _device; - d.resetDescriptorPool(*manager.pool, vk::DescriptorPoolResetFlags{}, vk::DispatchLoaderStatic{}); + d.resetDescriptorPool(*manager.pool, vk::DescriptorPoolResetFlags{}, vk::DispatchLoaderDefault{}); manager.size = 0; } diff --git a/src/engine/game/AddSystems.cpp b/src/engine/game/AddSystems.cpp index 8d5104a..e3af9db 100644 --- a/src/engine/game/AddSystems.cpp +++ b/src/engine/game/AddSystems.cpp @@ -15,7 +15,6 @@ #include #include #include -#include #include #include diff --git a/src/engine/idk/res/ResourceHandle.inl b/src/engine/idk/res/ResourceHandle.inl index 1e411e3..39729e3 100644 --- a/src/engine/idk/res/ResourceHandle.inl +++ b/src/engine/idk/res/ResourceHandle.inl @@ -2,10 +2,10 @@ #include #include -#include #include #include #include + namespace idk { template diff --git a/src/engine/vkn/ShaderModule.cpp b/src/engine/vkn/ShaderModule.cpp index f321e5c..f825546 100644 --- a/src/engine/vkn/ShaderModule.cpp +++ b/src/engine/vkn/ShaderModule.cpp @@ -185,11 +185,6 @@ namespace idk::vkn ubo_info[ub.name] = std::move(info); } - //这里反序列化的数据是错误的，不能执行析构函数 - using SVBuiltResource = decltype(resources.builtin_inputs); - char data[sizeof(SVBuiltResource)]; - std::construct_at((SVBuiltResource*)&data, std::move(resources.builtin_outputs)); - std::construct_at((SVBuiltResource*)&data, std::move(resources.builtin_inputs)); //for (auto& ub : cs) //{ diff --git a/src/engine/vkn/VknMeshModder.cpp b/src/engine/vkn/VknMeshModder.cpp index 52c2cb8..36db682 100644 --- a/src/engine/vkn/VknMeshModder.cpp +++ b/src/engine/vkn/VknMeshModder.cpp @@ -33,10 +33,6 @@ namespace idk::vkn vk::UniqueCommandBuffer cmd_buffer; vk::UniqueBuffer buffer; vk::UniqueDeviceMemory memory; - - ~StagingStuff() { - - } }; //Expensive (probably). StagingStuff TransferData(vk::CommandPool cmd_pool, vk::Queue queue, vk::PhysicalDevice pdevice, vk::Device device, size_t dst_offset, size_t num_bytes, const void* data, vk::Buffer dst_buffer, vk::Fence fence) diff --git a/src/engine/vkn/VknRenderTargetFactory.cpp b/src/engine/vkn/VknRenderTargetFactory.cpp index 7a0b94a..28d3064 100644 --- a/src/engine/vkn/VknRenderTargetFactory.cpp +++ b/src/engine/vkn/VknRenderTargetFactory.cpp @@ -36,14 +36,12 @@ namespace idk::vkn auto result = RenderTargetFactory::GenerateDefaultResource(); - auto pm = RscHandle{}; - if (pm) { - auto& m = *pm; - m.size = uvec2{ Core::GetSystem().GetScreenSize() }; - if (m.ColorGradingLut == RscHandle{}) - m.ColorGradingLut = RscHandle{ GetDefaultColorGradeGuid() }; - m.Name("Default RenderTarget"); - } + auto& m = *RscHandle{}; + + m.size = uvec2{ Core::GetSystem().GetScreenSize() }; + if (m.ColorGradingLut == RscHandle{}) + m.ColorGradingLut = RscHandle{GetDefaultColorGradeGuid()}; + m.Name("Default RenderTarget"); return result; }