修改暂时还原
This commit is contained in:
parent
e48f56135a
commit
228fafbbbb
@ -21,7 +21,7 @@ Accessible through Core::GetSystem<IDE>() [#include <IDE.h>]
|
||||
#include <editor/commands/CommandController.h>
|
||||
#include <editor/Registry.h>
|
||||
#include <editor/ObjectSelection.h>
|
||||
//#include "windows/IGE_IWindow.h"
|
||||
|
||||
#undef FindWindow
|
||||
|
||||
namespace idk
|
||||
|
||||
@ -176,11 +176,11 @@ namespace idk
|
||||
ImGui::TextDisabled("Values driven by Canvas.");
|
||||
return;
|
||||
}
|
||||
/*if (c_rt->GetGameObject()->HasComponent<AspectRatioFitter>())
|
||||
if (c_rt->GetGameObject()->HasComponent<AspectRatioFitter>())
|
||||
{
|
||||
ImGui::TextDisabled("Values driven by AspectRatioFitter.");
|
||||
return;
|
||||
}*/
|
||||
}
|
||||
|
||||
const float region_width = ImGui::GetWindowContentRegionWidth();
|
||||
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
@ -15,7 +15,6 @@
|
||||
#include <opengl/resource/OpenGLMesh.h>
|
||||
#include <opengl/resource/OpenGLTexture.h>
|
||||
#include <editor/IDE.h>
|
||||
#include <windows/IGE_IWindow.h>
|
||||
#include <file/FileSystem.h>
|
||||
#include <debug/LogSystem.h>
|
||||
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
#include <type_traits>
|
||||
|
||||
#include <res/Resource.h>
|
||||
#include <res/ResourceUtils.inl>
|
||||
#include <res/ResourceManager.inl>
|
||||
#include <math/comparable.inl>
|
||||
#include <res/Guid.inl>
|
||||
|
||||
namespace idk
|
||||
{
|
||||
template<typename Res>
|
||||
|
||||
@ -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)
|
||||
//{
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -36,14 +36,12 @@ namespace idk::vkn
|
||||
|
||||
auto result = RenderTargetFactory::GenerateDefaultResource();
|
||||
|
||||
auto pm = RscHandle<VknRenderTarget>{};
|
||||
if (pm) {
|
||||
auto& m = *pm;
|
||||
auto& m = *RscHandle<VknRenderTarget>{};
|
||||
|
||||
m.size = uvec2{ Core::GetSystem<Application>().GetScreenSize() };
|
||||
if (m.ColorGradingLut == RscHandle<Texture>{})
|
||||
m.ColorGradingLut = RscHandle<Texture>{ GetDefaultColorGradeGuid() };
|
||||
m.ColorGradingLut = RscHandle<Texture>{GetDefaultColorGradeGuid()};
|
||||
m.Name("Default RenderTarget");
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user