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 gcc/msvc error

Browse Source
This commit is contained in:
kbz_8
2024-12-17 01:40:58 +01:00
parent 393735b1d6
commit 30f4602b1c
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
runtime/Sources/Graphics/PutPixelManager.cpp
View File

@@ -44,14 +44,6 @@ namespace mlx
MLX_PROFILE_FUNCTION(); MLX_PROFILE_FUNCTION();
Verify((bool)p_renderer, "invalid renderer pointer"); Verify((bool)p_renderer, "invalid renderer pointer");
VkExtent2D extent;
if(p_renderer->GetWindow())
extent = kvfGetSwapchainImagesSize(p_renderer->GetSwapchain().Get());
else if(p_renderer->GetRenderTarget())
extent = VkExtent2D{ .width = p_renderer->GetRenderTarget()->GetWidth(), .height = p_renderer->GetRenderTarget()->GetHeight() };
else
FatalError("a renderer was created without window nor render target attached (wtf)");
auto it = m_placements.find(draw_layer); auto it = m_placements.find(draw_layer);
if(it != m_placements.end()) if(it != m_placements.end())
{ {
@@ -62,6 +54,13 @@ namespace mlx
if(m_current_texture_index >= m_textures.size()) if(m_current_texture_index >= m_textures.size())
{ {
VkExtent2D extent;
if(p_renderer->GetWindow())
extent = kvfGetSwapchainImagesSize(p_renderer->GetSwapchain().Get());
else if(p_renderer->GetRenderTarget())
extent = VkExtent2D{ .width = p_renderer->GetRenderTarget()->GetWidth(), .height = p_renderer->GetRenderTarget()->GetHeight() };
else
FatalError("a renderer was created without window nor render target attached (wtf)");
#ifdef DEBUG #ifdef DEBUG
m_textures.push_back(std::make_unique<Texture>(CPUBuffer{}, extent.width, extent.height, VK_FORMAT_R8G8B8A8_SRGB, false, "mlx_put_pixel_layer_" + std::to_string(m_current_texture_index))); m_textures.push_back(std::make_unique<Texture>(CPUBuffer{}, extent.width, extent.height, VK_FORMAT_R8G8B8A8_SRGB, false, "mlx_put_pixel_layer_" + std::to_string(m_current_texture_index)));
#else #else

1
runtime/Sources/Renderer/Memory.cpp
View File

@@ -12,6 +12,7 @@
#pragma GCC diagnostic ignored "-Wmissing-field-initializers" #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wunused-variable" #pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wparentheses" #pragma GCC diagnostic ignored "-Wparentheses"
#include <vma.h> #include <vma.h>
#pragma GCC diagnostic pop #pragma GCC diagnostic pop

4
xmake.lua
View File

@@ -3,7 +3,7 @@
add_requires("libsdl", { configs = { sdlmain = false } }) add_requires("libsdl", { configs = { sdlmain = false } })
add_rules("mode.debug", "mode.release") add_rules("mode.debug", "mode.release")
set_languages("cxx20", "c99") set_languages("cxx20", "c11")
set_objectdir("objs/xmake/$(os)_$(arch)") set_objectdir("objs/xmake/$(os)_$(arch)")
set_targetdir("./") set_targetdir("./")
@@ -94,7 +94,7 @@ target("Test")
add_deps("mlx") add_deps("mlx")
add_files("example/main.c") add_files("example/main.c", { languages = "c99" })
add_defines("SDL_MAIN_HANDLED") add_defines("SDL_MAIN_HANDLED")