diff --git a/Makefile b/Makefile index a0bd7d7..24be25e 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # By: maldavid +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2022/10/04 16:43:41 by maldavid #+# #+# # -# Updated: 2023/04/04 16:21:17 by maldavid ### ########.fr # +# Updated: 2023/04/21 14:13:15 by maldavid ### ########.fr # # # # **************************************************************************** # @@ -16,6 +16,7 @@ SRCS = $(wildcard $(addsuffix /*.cpp, ./src/core)) SRCS += $(wildcard $(addsuffix /*.cpp, ./src/platform)) SRCS += $(wildcard $(addsuffix /*.cpp, ./src/renderer)) SRCS += $(wildcard $(addsuffix /*.cpp, ./src/renderer/**)) +SRCS += $(wildcard $(addsuffix /*.cpp, ./src/utils/**)) OBJS = $(SRCS:.cpp=.o) @@ -29,10 +30,10 @@ ifeq ($(TOOLCHAIN), gcc) endif CXXFLAGS = -std=c++17 -O3 -fPIC -INCLUDES = -I./includes -I./src -I./third_party +INCLUDES = -I./includes -I./src -I./third_party ifeq ($(DEBUG), true) - CXXFLAGS += -g + CXXFLAGS += -g -D DEBUG endif RM = rm -f diff --git a/includes/mlx.h b/includes/mlx.h index fb1aa91..108fd2d 100644 --- a/includes/mlx.h +++ b/includes/mlx.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 16:56:35 by maldavid #+# #+# */ -/* Updated: 2023/04/19 12:35:03 by maldavid ### ########.fr */ +/* Updated: 2023/04/19 13:11:27 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -105,8 +105,8 @@ int mlx_mouse_move(void* mlx, void* win, int x, int y); * @brief Get cursor's position * * @param mlx Internal MLX application - * @param x X coordinate - * @param y Y coordinate + * @param x Get x coordinate + * @param y Get y coordinate * * @return (int) Always return 0, made this to copy the behaviour of the original MLX */ @@ -148,7 +148,7 @@ int mlx_pixel_put(void* mlx, void* win, int x, int y, int color); * @param width Width of the image * @param height Height of the image * - * @return (void*) An opaque pointer to the internal image + * @return (void*) An opaque pointer to the internal image or NULL (0x0) in case of error */ void* mlx_new_image(void* mlx, int width, int height); @@ -161,7 +161,7 @@ void* mlx_new_image(void* mlx, int width, int height); * @param size_line Get size of a line of the image * @param endian Get endian of the processor * - * @return (char*) Return raw address of the image's data + * @return (char*) Return raw address of the image's data or NULL (0x0) in case of error */ char* mlx_get_data_addr(void* mlx, void* img, int* bits_per_pixel, int* size_line, int* endian); @@ -197,7 +197,7 @@ int mlx_destroy_image(void* mlx, void* img); * @param width Get the width of the image * @param heigth Get the height of the image * - * @return (void*) An opaque pointer to the internal image + * @return (void*) An opaque pointer to the internal image or NULL (0x0) in case of error */ void* mlx_png_file_to_image(void* mlx, char* filename, int* width, int* height); @@ -209,7 +209,7 @@ void* mlx_png_file_to_image(void* mlx, char* filename, int* width, int* height); * @param width Get the width of the image * @param heigth Get the height of the image * - * @return (void*) An opaque pointer to the internal image + * @return (void*) An opaque pointer to the internal image or NULL (0x0) in case of error */ void* mlx_jpg_file_to_image(void* mlx, char* filename, int* width, int* height); @@ -221,7 +221,7 @@ void* mlx_jpg_file_to_image(void* mlx, char* filename, int* width, int* height); * @param width Get the width of the image * @param heigth Get the height of the image * - * @return (void*) An opaque pointer to the internal image + * @return (void*) An opaque pointer to the internal image or NULL (0x0) in case of error */ void* mlx_bmp_file_to_image(void* mlx, char* filename, int* width, int* height); diff --git a/src/core/application.cpp b/src/core/application.cpp index ae8ca9e..90ccd3c 100644 --- a/src/core/application.cpp +++ b/src/core/application.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 22:10:52 by maldavid #+# #+# */ -/* Updated: 2023/04/12 11:03:57 by maldavid ### ########.fr */ +/* Updated: 2023/04/21 19:24:35 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -36,36 +36,32 @@ namespace mlx::core void* Application::newTexture(int w, int h) { - std::shared_ptr texture = std::make_shared(); - texture->create(nullptr, w, h, VK_FORMAT_R8G8B8A8_UNORM); - TextureID id = _texture_lib.addTextureToLibrary(texture); - _texture_ids.push_back(id); - return &_texture_ids.back(); + _textures.emplace_front().create(nullptr, w, h, VK_FORMAT_R8G8B8A8_UNORM); + _textures.front().openCPUmap(); + return &_textures.front(); } void* Application::newStbTexture(char* file, int* w, int* h) { - std::shared_ptr texture = std::make_shared(stbTextureLoad(file, w, h)); - TextureID id = _texture_lib.addTextureToLibrary(texture); - _texture_ids.push_back(id); - return &_texture_ids.back(); + _textures.emplace_front(stbTextureLoad(file, w, h)); + _textures.front().openCPUmap(); + return &_textures.front(); } - char* Application::mapTexture(void* img, int* bits_per_pixel, int* size_line, int* endian) + char* Application::mapTexture(Texture* img, int* bits_per_pixel, int* size_line, int* endian) { - TextureID id = *static_cast(img); - std::shared_ptr texture = _texture_lib.getTexture(id); - char* map = static_cast(texture->openCPUmap()); - *bits_per_pixel = sizeof(uint32_t) * 8; - *size_line = texture->getWidth(); - *endian = isSystemBigEndian(); - return map; + static const int endianness = isSystemBigEndian(); + + *bits_per_pixel = 32; + *size_line = img->getWidth() * 4; + *endian = endianness; + return static_cast(img->getMap()); } void Application::destroyTexture(void* ptr) { vkDeviceWaitIdle(Render_Core::get().getDevice().get()); - TextureID id = *static_cast(ptr); - _texture_lib.removeTextureFromLibrary(id); + Texture* texture = static_cast(ptr); + texture->destroy(); } } diff --git a/src/core/application.h b/src/core/application.h index ca334bc..0ea9015 100644 --- a/src/core/application.h +++ b/src/core/application.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 21:49:46 by maldavid #+# #+# */ -/* Updated: 2023/04/19 12:14:07 by maldavid ### ########.fr */ +/* Updated: 2023/04/21 19:24:12 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -25,8 +25,6 @@ #include #include -#include - namespace mlx::core { class Application @@ -50,7 +48,7 @@ namespace mlx::core void* newTexture(int w, int h); void* newStbTexture(char* file, int* w, int* h); // stb textures are format managed by stb image (png, jpg, bpm, ...) - char* mapTexture(void* img, int* bits_per_pixel, int* size_line, int* endian); + char* mapTexture(Texture* img, int* bits_per_pixel, int* size_line, int* endian); inline void texturePut(void* win, void* img, int x, int y); void destroyTexture(void* ptr); @@ -62,8 +60,7 @@ namespace mlx::core ~Application() = default; private: - TextureLibrary _texture_lib; - std::list _texture_ids; + std::list _textures; std::vector> _graphics; std::function _loop_hook; std::unique_ptr _in; diff --git a/src/core/application.inl b/src/core/application.inl index b4d74f5..17c3df5 100644 --- a/src/core/application.inl +++ b/src/core/application.inl @@ -69,8 +69,7 @@ namespace mlx::core void Application::texturePut(void* win, void* img, int x, int y) { - TextureID id = *static_cast(img); - std::shared_ptr texture = _texture_lib.getTexture(id); + Texture* texture = static_cast(img); _graphics[*static_cast(win)]->texturePut(texture, x, y); } diff --git a/src/core/bridge.cpp b/src/core/bridge.cpp index 32a19b0..00bad16 100644 --- a/src/core/bridge.cpp +++ b/src/core/bridge.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/04 17:35:20 by maldavid #+# #+# */ -/* Updated: 2023/04/19 12:14:02 by maldavid ### ########.fr */ +/* Updated: 2023/04/21 19:29:49 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -24,26 +24,26 @@ extern "C" return new mlx::core::Application(); } - void* mlx_new_window(void* mlx, int w, int h, const char* title) + void* mlx_new_window(mlx::core::Application* mlx, int w, int h, const char* title) { - return static_cast(mlx)->newGraphicsSuport(w, h, title); + return mlx->newGraphicsSuport(w, h, title); } - int mlx_loop_hook(void* mlx, int (*f)(void*), void* param) + int mlx_loop_hook(mlx::core::Application* mlx, int (*f)(void*), void* param) { - static_cast(mlx)->loopHook(f, param); + mlx->loopHook(f, param); return 0; } - int mlx_loop(void* mlx) + int mlx_loop(mlx::core::Application* mlx) { - static_cast(mlx)->run(); + mlx->run(); return 0; } - int mlx_loop_end(void* mlx) + int mlx_loop_end(mlx::core::Application* mlx) { - static_cast(mlx)->loopEnd(); + mlx->loopEnd(); return 0; } @@ -57,47 +57,47 @@ extern "C" return SDL_ShowCursor(SDL_DISABLE); } - int mlx_mouse_move(void* mlx, void* win, int x, int y) + int mlx_mouse_move(mlx::core::Application* mlx, void* win, int x, int y) { - static_cast(mlx)->mouseMove(win, x, y); + mlx->mouseMove(win, x, y); return 0; } - int mlx_mouse_get_pos(void* mlx, int* x, int* y) + int mlx_mouse_get_pos(mlx::core::Application* mlx, int* x, int* y) { - static_cast(mlx)->getMousePos(x, y); + mlx->getMousePos(x, y); return 0; } - int mlx_on_event(void* mlx, void* win, int event, int (*funct_ptr)(int, void*), void* param) + int mlx_on_event(mlx::core::Application* mlx, void* win, int event, int (*funct_ptr)(int, void*), void* param) { - static_cast(mlx)->onEvent(win, event, funct_ptr, param); + mlx->onEvent(win, event, funct_ptr, param); return 0; } - void* mlx_new_image(void* mlx, int width, int height) + void* mlx_new_image(mlx::core::Application* mlx, int width, int height) { - return static_cast(mlx)->newTexture(width, height); + return mlx->newTexture(width, height); } - char* mlx_get_data_addr(void* mlx, void* img, int* bits_per_pixel, int* size_line, int* endian) + char* mlx_get_data_addr(mlx::core::Application* mlx, mlx::Texture* img, int* bits_per_pixel, int* size_line, int* endian) { - return static_cast(mlx)->mapTexture(img, bits_per_pixel, size_line, endian); + return mlx->mapTexture(img, bits_per_pixel, size_line, endian); } - int mlx_put_image_to_window(void* mlx, void* win, void* img, int x, int y) + int mlx_put_image_to_window(mlx::core::Application* mlx, void* win, void* img, int x, int y) { - static_cast(mlx)->texturePut(win, img, x, y); + mlx->texturePut(win, img, x, y); return 0; } - int mlx_destroy_image(void* mlx, void* img) + int mlx_destroy_image(mlx::core::Application* mlx, void* img) { - static_cast(mlx)->destroyTexture(img); + mlx->destroyTexture(img); return 0; } - void* mlx_png_file_to_image(void* mlx, char* filename, int* width, int* height) + void* mlx_png_file_to_image(mlx::core::Application* mlx, char* filename, int* width, int* height) { std::filesystem::path file(filename); if(file.extension() != ".png") @@ -105,10 +105,10 @@ extern "C" mlx::core::error::report(e_kind::error, "PNG loader : not a png file '%s'", filename); return nullptr; } - return static_cast(mlx)->newStbTexture(filename, width, height); + return mlx->newStbTexture(filename, width, height); } - void* mlx_jpg_file_to_image(void* mlx, char* filename, int* width, int* height) + void* mlx_jpg_file_to_image(mlx::core::Application* mlx, char* filename, int* width, int* height) { std::filesystem::path file(filename); if(file.extension() != ".jpg" && file.extension() != ".jpeg") @@ -116,10 +116,10 @@ extern "C" mlx::core::error::report(e_kind::error, "PNG loader : not a jpg file '%s'", filename); return nullptr; } - return static_cast(mlx)->newStbTexture(filename, width, height); + return mlx->newStbTexture(filename, width, height); } - void* mlx_bmp_file_to_image(void* mlx, char* filename, int* width, int* height) + void* mlx_bmp_file_to_image(mlx::core::Application* mlx, char* filename, int* width, int* height) { std::filesystem::path file(filename); if(file.extension() != ".bmp" && file.extension() != ".dib") @@ -127,53 +127,53 @@ extern "C" mlx::core::error::report(e_kind::error, "PNG loader : not a jpg file '%s'", filename); return nullptr; } - return static_cast(mlx)->newStbTexture(filename, width, height); + return mlx->newStbTexture(filename, width, height); } - int mlx_pixel_put(void* mlx, void* win, int x, int y, int color) + int mlx_pixel_put(mlx::core::Application* mlx, void* win, int x, int y, int color) { unsigned char color_bits[4]; color_bits[0] = (color & 0x00FF0000) >> 16; color_bits[1] = (color & 0x0000FF00) >> 8; color_bits[2] = color & 0x000000FF; color_bits[3] = 0xFF; - static_cast(mlx)->pixelPut(win, x, y, *reinterpret_cast(color_bits)); + mlx->pixelPut(win, x, y, *reinterpret_cast(color_bits)); return 0; } - int mlx_string_put(void* mlx, void* win, int x, int y, int color, char* str) + int mlx_string_put(mlx::core::Application* mlx, void* win, int x, int y, int color, char* str) { unsigned char color_bits[4]; color_bits[0] = (color & 0x00FF0000) >> 16; color_bits[1] = (color & 0x0000FF00) >> 8; color_bits[2] = color & 0x000000FF; color_bits[3] = 0xFF; - static_cast(mlx)->stringPut(win, x, y, *reinterpret_cast(color_bits), str); + mlx->stringPut(win, x, y, *reinterpret_cast(color_bits), str); return 0; } - int mlx_clear_window(void* mlx, void* win) + int mlx_clear_window(mlx::core::Application* mlx, void* win) { - static_cast(mlx)->clearGraphicsSupport(win); + mlx->clearGraphicsSupport(win); return 0; } - int mlx_destroy_window(void* mlx, void* win) + int mlx_destroy_window(mlx::core::Application* mlx, void* win) { - static_cast(mlx)->destroyGraphicsSupport(win); + mlx->destroyGraphicsSupport(win); return 0; } - int mlx_destroy_display(void* mlx) + int mlx_destroy_display(mlx::core::Application* mlx) { - delete static_cast(mlx); + delete mlx; mlx::Render_Core::get().destroy(); return 0; } - int mlx_get_screens_size(void* mlx, int* w, int* h) + int mlx_get_screens_size(mlx::core::Application* mlx, int* w, int* h) { - static_cast(mlx)->getScreenSize(w, h); + mlx->getScreenSize(w, h); return 0; } } diff --git a/src/core/graphics.h b/src/core/graphics.h index b3edab5..66606d8 100644 --- a/src/core/graphics.h +++ b/src/core/graphics.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/02 14:49:49 by maldavid #+# #+# */ -/* Updated: 2023/04/19 11:32:16 by maldavid ### ########.fr */ +/* Updated: 2023/04/21 18:43:38 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -42,7 +42,7 @@ namespace mlx inline void clearRenderData() noexcept; inline void pixelPut(int x, int y, uint32_t color) noexcept; inline void stringPut(int x, int y, int color, std::string str); - inline void texturePut(std::shared_ptr texture, int x, int y); + inline void texturePut(Texture* texture, int x, int y); void endRender() noexcept; diff --git a/src/core/graphics.inl b/src/core/graphics.inl index f28aa38..d7bc2aa 100644 --- a/src/core/graphics.inl +++ b/src/core/graphics.inl @@ -42,7 +42,7 @@ namespace mlx _text_put_pipeline->put(x, y, color, str); } - void GraphicsSupport::texturePut(std::shared_ptr texture, int x, int y) + void GraphicsSupport::texturePut(Texture* texture, int x, int y) { _textures_to_render.emplace(texture, x, y); } diff --git a/src/renderer/command/vk_cmd_buffer.cpp b/src/renderer/command/vk_cmd_buffer.cpp index f9572ad..1066cd8 100644 --- a/src/renderer/command/vk_cmd_buffer.cpp +++ b/src/renderer/command/vk_cmd_buffer.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:26:06 by maldavid #+# #+# */ -/* Updated: 2023/04/02 18:13:38 by maldavid ### ########.fr */ +/* Updated: 2023/04/21 13:24:56 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,11 +19,16 @@ namespace mlx { void CmdBuffer::init(CmdManager* manager) { - _manager = manager; + init(&manager->getCmdPool()); + } + + void CmdBuffer::init(CmdPool* pool) + { + _pool = pool; VkCommandBufferAllocateInfo allocInfo{}; allocInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; - allocInfo.commandPool = manager->getCmdPool().get(); + allocInfo.commandPool = pool->get(); allocInfo.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; allocInfo.commandBufferCount = 1; @@ -57,6 +62,26 @@ namespace mlx _is_recording = false; } + void CmdBuffer::submitIdle() noexcept + { + auto device = Render_Core::get().getDevice().get(); + + VkSubmitInfo submitInfo = {}; + submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; + submitInfo.commandBufferCount = 1; + submitInfo.pCommandBuffers = &_cmd_buffer; + + VkFenceCreateInfo fenceCreateInfo = {}; + fenceCreateInfo.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; + + VkFence fence; + vkCreateFence(device, &fenceCreateInfo, nullptr, &fence); + vkResetFences(device, 1, &fence); + vkQueueSubmit(Render_Core::get().getQueue().getGraphic(), 1, &submitInfo, fence); + vkWaitForFences(device, 1, &fence, VK_TRUE, UINT64_MAX); + vkDestroyFence(device, fence, nullptr); + } + void CmdBuffer::submit(Semaphore& semaphores) noexcept { VkSemaphore signalSemaphores[] = { semaphores.getRenderImageSemaphore() }; @@ -79,7 +104,6 @@ namespace mlx void CmdBuffer::destroy() noexcept { - vkFreeCommandBuffers(Render_Core::get().getDevice().get(), _manager->getCmdPool().get(), 1, &_cmd_buffer); _fence.destroy(); } } diff --git a/src/renderer/command/vk_cmd_buffer.h b/src/renderer/command/vk_cmd_buffer.h index b94db94..ee6d8df 100644 --- a/src/renderer/command/vk_cmd_buffer.h +++ b/src/renderer/command/vk_cmd_buffer.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/06 18:25:42 by maldavid #+# #+# */ -/* Updated: 2023/04/02 17:57:26 by maldavid ### ########.fr */ +/* Updated: 2023/04/21 13:20:49 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -22,23 +22,27 @@ namespace mlx { public: void init(class CmdManager* manager); + void init(class CmdPool* pool); void destroy() noexcept; void beginRecord(VkCommandBufferUsageFlags usage = 0); void submit(class Semaphore& semaphores) noexcept; + void submitIdle() noexcept; inline void waitForExecution() noexcept { _fence.waitAndReset(); } inline void reset() noexcept { vkResetCommandBuffer(_cmd_buffer, 0); } void endRecord(); inline bool isRecording() const noexcept { return _is_recording; } + inline bool isInit() const noexcept { return _cmd_buffer != VK_NULL_HANDLE; } inline VkCommandBuffer& operator()() noexcept { return _cmd_buffer; } inline VkCommandBuffer& get() noexcept { return _cmd_buffer; } + inline Fence& getFence() noexcept { return _fence; } private: Fence _fence; VkCommandBuffer _cmd_buffer = VK_NULL_HANDLE; - class CmdManager* _manager = nullptr; + class CmdPool* _pool = nullptr; bool _is_recording = false; }; } diff --git a/src/renderer/core/render_core.h b/src/renderer/core/render_core.h index e28e0ff..2a7cddb 100644 --- a/src/renderer/core/render_core.h +++ b/src/renderer/core/render_core.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/10/08 19:16:32 by maldavid #+# #+# */ -/* Updated: 2023/01/25 15:23:19 by maldavid ### ########.fr */ +/* Updated: 2023/04/21 14:13:32 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -30,7 +30,7 @@ namespace mlx uint32_t findMemoryType(uint32_t typeFilter, VkMemoryPropertyFlags properties); } - #ifndef NDEBUG + #ifndef DEBUG constexpr const bool enableValidationLayers = true; #else constexpr const bool enableValidationLayers = false; diff --git a/src/renderer/images/texture.cpp b/src/renderer/images/texture.cpp index 856502a..4429992 100644 --- a/src/renderer/images/texture.cpp +++ b/src/renderer/images/texture.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/03/31 18:03:35 by maldavid #+# #+# */ -/* Updated: 2023/04/08 18:41:54 by maldavid ### ########.fr */ +/* Updated: 2023/04/21 19:31:15 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -58,12 +58,11 @@ namespace mlx void* Texture::openCPUmap() { - if(_cpu_map == nullptr) - { - _cpu_map = std::make_shared(); - _cpu_map->create(Buffer::kind::dynamic, sizeof(uint32_t) * (getWidth() * getHeight()), VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT); - Image::copyToBuffer(*_cpu_map); - } + if(_cpu_map_adress != nullptr) + return _cpu_map_adress; + _cpu_map = std::make_shared(); + _cpu_map->create(Buffer::kind::dynamic, sizeof(uint32_t) * (getWidth() * getHeight()), VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT); + Image::copyToBuffer(*_cpu_map); if(!_cpu_map->isMapped()) _cpu_map->mapMem(&_cpu_map_adress); if(_cpu_map_adress == nullptr) @@ -103,15 +102,9 @@ namespace mlx if(!std::filesystem::exists(std::move(file))) core::error::report(e_kind::fatal_error, "Image : file not found '%s'", filename.c_str()); if(stbi_is_hdr(filename.c_str())) - { - data = (uint8_t*)stbi_loadf(filename.c_str(), w, h, &channels, 4); - format = VK_FORMAT_R32G32B32A32_SFLOAT; - } - else - { - data = stbi_load(filename.c_str(), w, h, &channels, 4); - format = VK_FORMAT_R8G8B8A8_UNORM; - } + core::error::report(e_kind::fatal_error, "Texture : unsupported image format '%s'", filename.c_str()); + data = stbi_load(filename.c_str(), w, h, &channels, 4); + format = VK_FORMAT_R8G8B8A8_UNORM; texture.create(data, *w, *h, format); stbi_image_free(data); return texture; diff --git a/src/renderer/images/texture.h b/src/renderer/images/texture.h index 81f96c5..0cccb0f 100644 --- a/src/renderer/images/texture.h +++ b/src/renderer/images/texture.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/03/08 02:24:58 by maldavid #+# #+# */ -/* Updated: 2023/04/07 16:39:35 by maldavid ### ########.fr */ +/* Updated: 2023/04/21 19:05:34 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -34,6 +34,7 @@ namespace mlx void destroy() noexcept override; void* openCPUmap(); + inline void* getMap() const noexcept { return _cpu_map_adress; } inline void setDescriptor(DescriptorSet set) noexcept { _set = std::move(set); } inline VkDescriptorSet getSet() noexcept { return _set.isInit() ? _set.get() : VK_NULL_HANDLE; } @@ -56,11 +57,11 @@ namespace mlx struct TextureRenderData { - std::shared_ptr texture; + Texture* texture; int x; int y; - TextureRenderData(std::shared_ptr _texture, int _x, int _y) : texture(_texture), x(_x), y(_y) {} + TextureRenderData(Texture* _texture, int _x, int _y) : texture(_texture), x(_x), y(_y) {} bool operator==(const TextureRenderData& rhs) const { return texture == rhs.texture && x == rhs.x && y == rhs.y; } }; } @@ -72,7 +73,7 @@ namespace std { size_t operator()(const mlx::TextureRenderData& td) const noexcept { - return std::hash>()(td.texture) + std::hash()(td.x) + std::hash()(td.y); + return std::hash()(td.texture) + std::hash()(td.x) + std::hash()(td.y); } }; } diff --git a/src/renderer/images/vk_image.cpp b/src/renderer/images/vk_image.cpp index 10f32f4..6022709 100644 --- a/src/renderer/images/vk_image.cpp +++ b/src/renderer/images/vk_image.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/01/25 11:59:07 by maldavid #+# #+# */ -/* Updated: 2023/04/13 15:07:01 by maldavid ### ########.fr */ +/* Updated: 2023/04/21 13:23:52 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,6 +14,7 @@ #include #include #include +#include namespace mlx { @@ -53,6 +54,8 @@ namespace mlx core::error::report(e_kind::fatal_error, "Vulkan : failed to allocate memory for an image"); vkBindImageMemory(Render_Core::get().getDevice().get(), _image, _memory, 0); + + _pool.init(); } void Image::createImageView(VkImageViewType type, VkImageAspectFlags aspectFlags) noexcept @@ -93,24 +96,11 @@ namespace mlx void Image::copyFromBuffer(Buffer& buffer) { - CmdPool cmdpool; - cmdpool.init(); - auto device = Render_Core::get().getDevice().get(); + if(!_transfer_cmd.isInit()) + _transfer_cmd.init(&_pool); - VkCommandBufferAllocateInfo allocInfo{}; - allocInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; - allocInfo.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; - allocInfo.commandPool = cmdpool.get(); - allocInfo.commandBufferCount = 1; - - VkCommandBuffer cmdBuffer; - vkAllocateCommandBuffers(device, &allocInfo, &cmdBuffer); - - VkCommandBufferBeginInfo beginInfo{}; - beginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO; - beginInfo.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT; - - vkBeginCommandBuffer(cmdBuffer, &beginInfo); + _transfer_cmd.reset(); + _transfer_cmd.beginRecord(); VkImageMemoryBarrier copy_barrier = {}; copy_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; @@ -123,7 +113,7 @@ namespace mlx copy_barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; copy_barrier.subresourceRange.levelCount = 1; copy_barrier.subresourceRange.layerCount = 1; - vkCmdPipelineBarrier(cmdBuffer, VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, nullptr, 0, nullptr, 1, ©_barrier); + vkCmdPipelineBarrier(_transfer_cmd.get(), VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, nullptr, 0, nullptr, 1, ©_barrier); VkBufferImageCopy region = {}; region.bufferOffset = 0; @@ -139,7 +129,8 @@ namespace mlx _height, 1 }; - vkCmdCopyBufferToImage(cmdBuffer, buffer.get(), _image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, ®ion); + + vkCmdCopyBufferToImage(_transfer_cmd.get(), buffer.get(), _image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, ®ion); VkImageMemoryBarrier use_barrier = {}; use_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; @@ -153,43 +144,19 @@ namespace mlx use_barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; use_barrier.subresourceRange.levelCount = 1; use_barrier.subresourceRange.layerCount = 1; - vkCmdPipelineBarrier(cmdBuffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, 0, 0, nullptr, 0, nullptr, 1, &use_barrier); + vkCmdPipelineBarrier(_transfer_cmd.get(), VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, 0, 0, nullptr, 0, nullptr, 1, &use_barrier); - vkEndCommandBuffer(cmdBuffer); - - VkSubmitInfo submitInfo{}; - submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; - submitInfo.commandBufferCount = 1; - submitInfo.pCommandBuffers = &cmdBuffer; - - auto graphicsQueue = Render_Core::get().getQueue().getGraphic(); - - vkQueueSubmit(graphicsQueue, 1, &submitInfo, VK_NULL_HANDLE); - vkQueueWaitIdle(graphicsQueue); - - cmdpool.destroy(); + _transfer_cmd.endRecord(); + _transfer_cmd.submitIdle(); } void Image::copyToBuffer(Buffer& buffer) { - CmdPool cmdpool; - cmdpool.init(); - auto device = Render_Core::get().getDevice().get(); + if(!_transfer_cmd.isInit()) + _transfer_cmd.init(&_pool); - VkCommandBufferAllocateInfo allocInfo{}; - allocInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; - allocInfo.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; - allocInfo.commandPool = cmdpool.get(); - allocInfo.commandBufferCount = 1; - - VkCommandBuffer cmdBuffer; - vkAllocateCommandBuffers(device, &allocInfo, &cmdBuffer); - - VkCommandBufferBeginInfo beginInfo{}; - beginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO; - beginInfo.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT; - - vkBeginCommandBuffer(cmdBuffer, &beginInfo); + _transfer_cmd.reset(); + _transfer_cmd.beginRecord(); VkImageMemoryBarrier copy_barrier = {}; copy_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; @@ -202,7 +169,7 @@ namespace mlx copy_barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; copy_barrier.subresourceRange.levelCount = 1; copy_barrier.subresourceRange.layerCount = 1; - vkCmdPipelineBarrier(cmdBuffer, VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, nullptr, 0, nullptr, 1, ©_barrier); + vkCmdPipelineBarrier(_transfer_cmd.get(), VK_PIPELINE_STAGE_HOST_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, nullptr, 0, nullptr, 1, ©_barrier); VkBufferImageCopy region = {}; region.bufferOffset = 0; @@ -218,7 +185,7 @@ namespace mlx _height, 1 }; - vkCmdCopyImageToBuffer(cmdBuffer, _image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, buffer.get(), 1, ®ion); + vkCmdCopyImageToBuffer(_transfer_cmd.get(), _image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, buffer.get(), 1, ®ion); VkImageMemoryBarrier use_barrier = {}; use_barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; @@ -232,21 +199,10 @@ namespace mlx use_barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; use_barrier.subresourceRange.levelCount = 1; use_barrier.subresourceRange.layerCount = 1; - vkCmdPipelineBarrier(cmdBuffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, 0, 0, nullptr, 0, nullptr, 1, &use_barrier); + vkCmdPipelineBarrier(_transfer_cmd.get(), VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, 0, 0, nullptr, 0, nullptr, 1, &use_barrier); - vkEndCommandBuffer(cmdBuffer); - - VkSubmitInfo submitInfo{}; - submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; - submitInfo.commandBufferCount = 1; - submitInfo.pCommandBuffers = &cmdBuffer; - - auto graphicsQueue = Render_Core::get().getQueue().getGraphic(); - - vkQueueSubmit(graphicsQueue, 1, &submitInfo, VK_NULL_HANDLE); - vkQueueWaitIdle(graphicsQueue); - - cmdpool.destroy(); + _transfer_cmd.endRecord(); + _transfer_cmd.submitIdle(); } void Image::destroy() noexcept @@ -258,6 +214,9 @@ namespace mlx vkFreeMemory(Render_Core::get().getDevice().get(), _memory, nullptr); vkDestroyImage(Render_Core::get().getDevice().get(), _image, nullptr); + if(_transfer_cmd.isInit()) + _transfer_cmd.destroy(); + _pool.destroy(); } uint32_t formatSize(VkFormat format) diff --git a/src/renderer/images/vk_image.h b/src/renderer/images/vk_image.h index 6afa88c..f7af905 100644 --- a/src/renderer/images/vk_image.h +++ b/src/renderer/images/vk_image.h @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/01/25 11:54:21 by maldavid #+# #+# */ -/* Updated: 2023/04/13 10:59:04 by maldavid ### ########.fr */ +/* Updated: 2023/04/21 10:58:02 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,6 +16,8 @@ #include #include #include +#include +#include namespace mlx { @@ -45,6 +47,8 @@ namespace mlx virtual ~Image() = default; private: + CmdBuffer _transfer_cmd; + CmdPool _pool; VkImage _image = VK_NULL_HANDLE; VkDeviceMemory _memory = VK_NULL_HANDLE; VkImageView _image_view = VK_NULL_HANDLE; diff --git a/src/renderer/pixel_put.cpp b/src/renderer/pixel_put.cpp index 2956935..11b08ec 100644 --- a/src/renderer/pixel_put.cpp +++ b/src/renderer/pixel_put.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/03/31 15:14:50 by maldavid #+# #+# */ -/* Updated: 2023/04/19 11:32:54 by maldavid ### ########.fr */ +/* Updated: 2023/04/21 14:51:47 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -21,6 +21,7 @@ namespace mlx _texture.setDescriptor(renderer.getFragDescriptorSet().duplicate()); _buffer.create(Buffer::kind::dynamic, sizeof(uint32_t) * (width * height), VK_BUFFER_USAGE_TRANSFER_SRC_BIT); + _buffer.mapMem(&_map); _width = width; _height = height; } @@ -34,8 +35,6 @@ namespace mlx { if(x < 0 || y < 0 || x > _width || y > _height) return; - if(!_buffer.isMapped()) - _buffer.mapMem(&_map); unsigned char* mem = static_cast(_map) + (y * _width * sizeof(uint32_t)) + (x * sizeof(uint32_t)); *reinterpret_cast(mem) = color; _has_been_modified = true; @@ -43,8 +42,6 @@ namespace mlx void PixelPutPipeline::clear() { - if(!_buffer.isMapped()) - _buffer.mapMem(&_map); unsigned char* mem = static_cast(_map); std::memset(mem, 0, sizeof(uint32_t) * (_width * _height)); _has_been_modified = true; diff --git a/src/renderer/renderer.cpp b/src/renderer/renderer.cpp index 64dd62b..f007f6a 100644 --- a/src/renderer/renderer.cpp +++ b/src/renderer/renderer.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2022/12/18 17:25:16 by maldavid #+# #+# */ -/* Updated: 2023/04/02 18:10:01 by maldavid ### ########.fr */ +/* Updated: 2023/04/21 20:56:51 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/src/renderer/text_library.cpp b/src/renderer/text_library.cpp index 9c94610..ae3c527 100644 --- a/src/renderer/text_library.cpp +++ b/src/renderer/text_library.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/10 11:59:57 by maldavid #+# #+# */ -/* Updated: 2023/04/12 13:24:19 by maldavid ### ########.fr */ +/* Updated: 2023/04/19 13:43:43 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,7 +14,6 @@ #include #include #include -#include namespace mlx { diff --git a/src/renderer/text_pipeline.cpp b/src/renderer/text_pipeline.cpp index 7b2801c..588bb9a 100644 --- a/src/renderer/text_pipeline.cpp +++ b/src/renderer/text_pipeline.cpp @@ -6,7 +6,7 @@ /* By: maldavid +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/04/06 16:41:13 by maldavid #+# #+# */ -/* Updated: 2023/04/13 10:49:04 by maldavid ### ########.fr */ +/* Updated: 2023/04/19 13:43:49 by maldavid ### ########.fr */ /* */ /* ************************************************************************** */ @@ -19,8 +19,6 @@ #define STB_TRUETYPE_IMPLEMENTATION #include -#include - namespace mlx { TextDrawData::TextDrawData(std::string _text, int _color, int _x, int _y) : diff --git a/src/renderer/texture_library.cpp b/src/renderer/texture_library.cpp deleted file mode 100644 index 751d135..0000000 --- a/src/renderer/texture_library.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* texture_library.cpp :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: maldavid +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2023/04/01 14:24:00 by maldavid #+# #+# */ -/* Updated: 2023/04/12 13:26:59 by maldavid ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include -#include -#include - -namespace mlx -{ - std::shared_ptr TextureLibrary::getTexture(TextureID id) - { - if(!_cache.count(id)) - core::error::report(e_kind::fatal_error, "Texture Library : wrong texture ID '%d'", id); - return _cache[id]; - } - - TextureID TextureLibrary::addTextureToLibrary(std::shared_ptr texture) - { - auto it = std::find_if(_cache.begin(), _cache.end(), [=](const std::pair>& v) - { - return v.second.get() == texture.get(); - }); - if(it != _cache.end()) - return it->first; - _cache[_current_id] = texture; - _current_id++; - return _current_id - 1; - } - - void TextureLibrary::removeTextureFromLibrary(TextureID id) - { - if(_cache.count(id)) - { - _cache[id]->destroy(); - _cache.erase(id); - } - } - - void TextureLibrary::clearLibrary() - { - for(auto [id, texture] : _cache) - texture->destroy(); - _cache.clear(); - } -} diff --git a/src/renderer/texture_library.h b/src/renderer/texture_library.h deleted file mode 100644 index c486333..0000000 --- a/src/renderer/texture_library.h +++ /dev/null @@ -1,46 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* texture_library.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: maldavid +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2023/04/01 14:16:13 by maldavid #+# #+# */ -/* Updated: 2023/04/01 14:42:39 by maldavid ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#ifndef __MLX_TEXTURE_LIBRARY__ -#define __MLX_TEXTURE_LIBRARY__ - -#include -#include -#include -#include -#include - -namespace mlx -{ - using TextureID = uint32_t; - constexpr TextureID nulltexture = 0; - - class TextureLibrary - { - public: - TextureLibrary() = default; - - std::shared_ptr getTexture(TextureID id); - TextureID addTextureToLibrary(std::shared_ptr texture); - void removeTextureFromLibrary(TextureID id); - - void clearLibrary(); - - ~TextureLibrary() = default; - - private: - std::unordered_map> _cache; - TextureID _current_id = 1; - }; -} - -#endif