kbz_8/MacroLibX
1
0
Fork 0
mirror of https://github.com/seekrs/MacroLibX.git synced 2026-01-11 14:43:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing bug with image recreation

Browse Source
This commit is contained in:
kbz_8
2024-11-05 11:50:40 +01:00
parent e8de2c169d
commit 5f46c8cb55
14 changed files with 49 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -28,7 +28,7 @@ SHADERS_SRCS = $(wildcard $(addsuffix /*.nzsl, $(SHADERS_DIR)))
SPVS = $(SHADERS_SRCS:.nzsl=.spv.h)
CXX = clang++
CXXFLAGS = -std=c++20 -O3 -fPIC -Wall -Wextra -DSDL_MAIN_HANDLED
CXXFLAGS = -std=c++20 -fPIC -Wall -Wextra -DSDL_MAIN_HANDLED
INCLUDES = -I./includes -I./runtime/Includes -I./runtime/Sources -I./third_party
NZSLC = nzslc
@@ -49,6 +49,8 @@ endif
ifeq ($(DEBUG), true)
CXXFLAGS += -g3 -D DEBUG
LDFLAGS += -rdynamic
else
CXXFLAGS += -O3
endif
ifeq ($(FORCE_INTEGRATED_GPU), true)

14
runtime/Includes/Core/Logs.inl
View File

@@ -16,7 +16,7 @@ namespace mlx
}
catch(const std::exception& e)
{
Logs::Report(LogType::Error, "formatter exception catched in the log printer : "s + e.what());
Logs::Report(LogType::Error, line, file, function, "formatter exception catched in the log printer: "s + e.what());
}
}
@@ -32,7 +32,7 @@ namespace mlx
}
catch(const std::exception& e)
{
Logs::Report(LogType::Error, "formatter exception catched in the log printer : "s + e.what());
Logs::Report(LogType::Error, line, file, function, "formatter exception catched in the log printer: "s + e.what());
}
}
@@ -48,7 +48,7 @@ namespace mlx
}
catch(const std::exception& e)
{
Logs::Report(LogType::Error, "formatter exception catched in the log printer : "s + e.what());
Logs::Report(LogType::Error, line, file, function, "formatter exception catched in the log printer: "s + e.what());
}
}
@@ -64,7 +64,7 @@ namespace mlx
}
catch(const std::exception& e)
{
Logs::Report(LogType::Error, "formatter exception catched in the log printer : "s + e.what());
Logs::Report(LogType::Error, line, file, function, "formatter exception catched in the log printer: "s + e.what());
}
}
@@ -80,7 +80,7 @@ namespace mlx
}
catch(const std::exception& e)
{
Logs::Report(LogType::Error, "formatter exception catched in the log printer : "s + e.what());
Logs::Report(LogType::FatalError, line, file, function, "formatter exception catched in the log printer: "s + e.what());
}
}
@@ -98,7 +98,7 @@ namespace mlx
}
catch(const std::exception& e)
{
Logs::Report(LogType::Error, "formatter exception catched in the log printer : "s + e.what());
Logs::Report(LogType::FatalError, line, file, function, "formatter exception catched in the log printer: "s + e.what());
}
}
@@ -117,7 +117,7 @@ namespace mlx
}
catch(const std::exception& e)
{
Logs::Report(LogType::Error, "formatter exception catched in the log printer : "s + e.what());
Logs::Report(LogType::FatalError, line, file, function, "formatter exception catched in the log printer: "s + e.what());
}
}
#endif

2
runtime/Includes/Renderer/RenderPasses/Passes.h
View File

@@ -12,7 +12,7 @@ namespace mlx
public:
RenderPasses() = default;
void Init(class Renderer& renderer);
void Init();
void Pass(class Scene& scene, class Renderer& renderer, const Vec4f& clear_color);
void Destroy();

2
runtime/Includes/Renderer/ScenesRenderer.h
View File

@@ -9,7 +9,7 @@ namespace mlx
{
public:
SceneRenderer() = default;
void Init(class Renderer& renderer);
void Init();
void Render(class Scene& scene, class Renderer& renderer); // TODO : add RTT support
void Destroy();
~SceneRenderer() = default;

4
runtime/Sources/Core/Graphics.cpp
View File

@@ -12,7 +12,7 @@ namespace mlx
MLX_PROFILE_FUNCTION();
// TODO : re-enable render targets
m_renderer.Init(nullptr);
m_scene_renderer.Init(m_renderer);
m_scene_renderer.Init();
p_scene = std::make_unique<Scene>();
}
@@ -24,7 +24,7 @@ namespace mlx
{
MLX_PROFILE_FUNCTION();
m_renderer.Init(p_window.get());
m_scene_renderer.Init(m_renderer);
m_scene_renderer.Init();
p_scene = std::make_unique<Scene>();
}

2
runtime/Sources/Core/Memory.cpp
View File

@@ -40,6 +40,8 @@ namespace mlx
void MemManager::Free(void* ptr)
{
if(ptr == nullptr)
return;
auto it = std::find(s_blocks.begin(), s_blocks.end(), ptr);
if(it == s_blocks.end())
{

2
runtime/Sources/Graphics/Mesh.cpp
View File

@@ -7,7 +7,6 @@ namespace mlx
void Mesh::Draw(VkCommandBuffer cmd, std::size_t& drawcalls, std::size_t& polygondrawn) const noexcept
{
MLX_PROFILE_FUNCTION();
#pragma omp parallel for
for(std::size_t i = 0; i < m_sub_meshes.size(); i++)
Draw(cmd, drawcalls, polygondrawn, i);
}
@@ -26,7 +25,6 @@ namespace mlx
Mesh::~Mesh()
{
MLX_PROFILE_FUNCTION();
#pragma omp parallel for
for(auto& mesh : m_sub_meshes)
{
mesh.vbo.Destroy();

11
runtime/Sources/Renderer/Image.cpp
View File

@@ -8,7 +8,7 @@
#define STB_IMAGE_IMPLEMENTATION
#define STBI_ASSERT(x) mlx::Assert(x, "internal stb assertion " #x)
#define STBI_ASSERT(x) (mlx::Assert(x, "internal stb assertion " #x))
#define STBI_MALLOC(x) (mlx::MemManager::Get().Malloc(x))
#define STBI_REALLOC(p, x) (mlx::MemManager::Get().Realloc(p, x))
#define STBI_FREE(x) (mlx::MemManager::Get().Free(x))
@@ -162,6 +162,10 @@ namespace mlx
#endif
}
m_image = VK_NULL_HANDLE;
m_layout = VK_IMAGE_LAYOUT_UNDEFINED;
m_width = 0;
m_height = 0;
m_is_multisampled = false;
}
void Texture::Init(CPUBuffer pixels, std::uint32_t width, std::uint32_t height, VkFormat format, bool is_multisampled, [[maybe_unused]] std::string_view debug_name)
@@ -269,6 +273,7 @@ namespace mlx
Texture* StbTextureLoad(const std::filesystem::path& file, int* w, int* h)
{
using namespace std::literals;
MLX_PROFILE_FUNCTION();
std::string filename = file.string();
@@ -289,11 +294,9 @@ namespace mlx
Vec2i size;
int channels;
std::uint8_t* data = stbi_load(filename.c_str(), &size.x, &size.y, &channels, STBI_rgb_alpha);
std::uint8_t* data = stbi_load(filename.c_str(), &size.x, &size.y, &channels, 4);
CallOnExit defer([=]() { stbi_image_free(data); });
Verify(channels == 4, "invalid channels number in image loaded (should be 4, was %)", channels);
CPUBuffer buffer(size.x * size.y * 4);
std::memcpy(buffer.GetData(), data, buffer.GetSize());

7
runtime/Sources/Renderer/Pipelines/Graphics.cpp
View File

@@ -103,7 +103,6 @@ namespace mlx
scissor.extent = fb_extent;
RenderCore::Get().vkCmdSetScissor(command_buffer, 0, 1, &scissor);
#pragma omp parallel for
for(std::size_t i = 0; i < m_clears.size(); i++)
{
m_clears[i].color.float32[0] = clear[0];
@@ -128,7 +127,6 @@ namespace mlx
MLX_PROFILE_FUNCTION();
p_vertex_shader.reset();
p_fragment_shader.reset();
#pragma omp parallel for
for(auto& fb : m_framebuffers)
{
kvfDestroyFramebuffer(RenderCore::Get().GetDevice(), fb);
@@ -144,6 +142,9 @@ namespace mlx
kvfDestroyPipeline(RenderCore::Get().GetDevice(), m_pipeline);
m_pipeline = VK_NULL_HANDLE;
DebugLog("Vulkan: graphics pipeline destroyed");
p_renderer = nullptr;
m_clears.clear();
m_attachments.clear();
}
void GraphicPipeline::CreateFramebuffers(const std::vector<NonOwningPtr<Texture>>& render_targets, bool clear_attachments)
@@ -157,7 +158,6 @@ namespace mlx
attachment_views.push_back(p_renderer->GetSwapchain().GetSwapchainImages()[0].GetImageView());
}
#pragma omp parallel for
for(NonOwningPtr<Texture> image : render_targets)
{
attachments.push_back(kvfBuildAttachmentDescription((kvfIsDepthFormat(image->GetFormat()) ? KVF_IMAGE_DEPTH : KVF_IMAGE_COLOR), image->GetFormat(), image->GetLayout(), image->GetLayout(), clear_attachments, VK_SAMPLE_COUNT_1_BIT));
@@ -178,7 +178,6 @@ namespace mlx
DebugLog("Vulkan: framebuffer created");
}
}
#pragma omp parallel for
for(NonOwningPtr<Texture> image : render_targets)
{
m_framebuffers.push_back(kvfCreateFramebuffer(RenderCore::Get().GetDevice(), m_renderpass, attachment_views.data(), attachment_views.size(), { .width = image->GetWidth(), .height = image->GetHeight() }));

6
runtime/Sources/Renderer/RenderCore.cpp
View File

@@ -1,12 +1,16 @@
#include <PreCompiled.h>
#include <Renderer/RenderCore.h>
#include <Core/Memory.h>
#define KVF_IMPLEMENTATION
#ifdef DEBUG
#define KVF_ENABLE_VALIDATION_LAYERS
#endif
#define KVF_ASSERT(x) mlx::Assert(x, #x)
#define KVF_ASSERT(x) (mlx::Assert(x, "internal kvf assertion " #x))
#define KVF_MALLOC(x) (mlx::MemManager::Get().Malloc(x))
#define KVF_REALLOC(p, x) (mlx::MemManager::Get().Realloc(p, x))
#define KVF_FREE(x) (mlx::MemManager::Get().Free(x))
#if defined(MLX_COMPILER_GCC) || defined(MLX_COMPILER_CLANG)
#pragma clang diagnostic push

2
runtime/Sources/Renderer/RenderPasses/FinalPass.cpp
View File

@@ -20,7 +20,7 @@ namespace mlx
ShaderLayout fragment_shader_layout(
{
{ 0,
ShaderSetLayout({
ShaderSetLayout({
{ 0, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER }
})
}

31
runtime/Sources/Renderer/RenderPasses/Passes.cpp
View File

@@ -5,37 +5,30 @@
namespace mlx
{
void RenderPasses::Init(Renderer& renderer)
void RenderPasses::Init()
{
m_2Dpass.Init();
m_final.Init();
func::function<void(const EventBase&)> functor = [this, &renderer](const EventBase& event)
func::function<void(const EventBase&)> functor = [this](const EventBase& event)
{
if(event.What() == Event::ResizeEventCode)
{
m_main_render_texture.Destroy();
auto extent = kvfGetSwapchainImagesSize(renderer.GetSwapchain().Get());
#ifdef DEBUG
m_main_render_texture.Init({}, extent.width, extent.height, VK_FORMAT_R8G8B8A8_SRGB, false, "mlx_renderpasses_target");
#else
m_main_render_texture.Init({}, extent.width, extent.height, VK_FORMAT_R8G8B8A8_SRGB, false, {});
#endif
m_main_render_texture.TransitionLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
}
};
EventBus::RegisterListener({ functor, "__MlxRenderPasses" });
auto extent = kvfGetSwapchainImagesSize(renderer.GetSwapchain().Get());
#ifdef DEBUG
m_main_render_texture.Init({}, extent.width, extent.height, VK_FORMAT_R8G8B8A8_SRGB, false, "mlx_renderpasses_target");
#else
m_main_render_texture.Init({}, extent.width, extent.height, VK_FORMAT_R8G8B8A8_SRGB, false, {});
#endif
m_main_render_texture.TransitionLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
}
void RenderPasses::Pass(Scene& scene, Renderer& renderer, const Vec4f& clear_color)
{
if(!m_main_render_texture.IsInit())
{
auto extent = kvfGetSwapchainImagesSize(renderer.GetSwapchain().Get());
#ifdef DEBUG
m_main_render_texture.Init({}, extent.width, extent.height, VK_FORMAT_R8G8B8A8_SRGB, false, "mlx_renderpasses_target");
#else
m_main_render_texture.Init({}, extent.width, extent.height, VK_FORMAT_R8G8B8A8_SRGB, false, {});
#endif
m_main_render_texture.TransitionLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
}
m_main_render_texture.Clear(renderer.GetActiveCommandBuffer(), clear_color);
m_2Dpass.Pass(scene, renderer, m_main_render_texture);

4
runtime/Sources/Renderer/SceneRenderer.cpp
View File

@@ -6,10 +6,10 @@
namespace mlx
{
void SceneRenderer::Init(Renderer& renderer)
void SceneRenderer::Init()
{
MLX_PROFILE_FUNCTION();
m_passes.Init(renderer);
m_passes.Init();
}
void SceneRenderer::Render(Scene& scene, Renderer& renderer)

5
third_party/kvf.h vendored
View File

@@ -40,7 +40,7 @@
* by using #define KVF_NO_EXIT_ON_FAILURE
*
* If you are using Volk or any other meta loader you must define KVF_IMPL_VK_NO_PROTOTYPES
* or VK_NO_PROTOTYPES before including this file to avoid conflicts with Vulkan prototypes.
* before including this file to avoid conflicts with Vulkan prototypes.
* You will also need to pass the function pointers to kvf using dedicated functions.
*
* You can also #define KVF_ENABLE_VALIDATION_LAYERS to enable validation layers.
@@ -236,7 +236,7 @@ void kvfCheckVk(VkResult result);
#ifdef KVF_IMPL_VK_NO_PROTOTYPES
#ifdef KVF_DEFINE_VULKAN_FUNCTION_PROTOTYPE
#undef KVF_DEFINE_VULKAN_FUNCTION_PROTOTYPE
#undef KVF_DEFINE_VULKAN_FUNCTION_PROTOTYPE
#endif
#define KVF_DEFINE_VULKAN_FUNCTION_PROTOTYPE(fn) PFN_##fn fn
@@ -2122,6 +2122,7 @@ void kvfDestroyImageView(VkDevice device, VkImageView image_view)
void kvfTransitionImageLayout(VkDevice device, VkImage image, KvfImageType type, VkCommandBuffer cmd, VkFormat format, VkImageLayout old_layout, VkImageLayout new_layout, bool is_single_time_cmd_buffer)
{
KVF_ASSERT(device != VK_NULL_HANDLE);
KVF_ASSERT(cmd != VK_NULL_HANDLE);
if(new_layout == old_layout)
return;