.

renderer/vulkan/renderer.cpp

@@ -2,11 +2,12 @@
 // Created by Vicente Ferrari Smith on 13.02.26.
 //
 
-#include "../Grpahics.h"
+#include "renderer.h"
+#include "../graphics.h"
 
 #include <print>
 
-#include "init.h"
+#include "vulkan.h"
 #include "../sprite.h"
 #include <vma/vk_mem_alloc.h>
 #include <slang/slang.h>
@@ -152,7 +153,7 @@ void Renderer::create_pipeline_layout() {
     vkCreatePipelineLayout(device, &plci, nullptr, &pipelineLayout);
 }
 
-void Renderer::createFrameResources() {
+void Renderer::create_frame_resources() {
 
     const VkSemaphoreCreateInfo seci{
         .sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO,
@@ -352,91 +353,6 @@ void Renderer::update_bindless_slot(uint32_t slot, VkImageView view, VkSampler s
     vkUpdateDescriptorSets(device, 1, &write, 0, nullptr);
 }
 
-void Renderer::upload_texture(
-    const int w,
-    const int h,
-    const void* pixels,
-    VkImage *image,
-    VmaAllocation *allocation,
-    VkImageView *view,
-    uint32_t *descriptor_index)
-{
-    VkDeviceSize imageSize = w * h * 4;
-
-    // --- 1. Create Staging Buffer (CPU Visible) ---
-    VkBuffer stagingBuffer;
-    VmaAllocation stagingAlloc;
-
-    VkBufferCreateInfo stagingBufferInfo = { .sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
-    stagingBufferInfo.size = imageSize;
-    stagingBufferInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
-
-    VmaAllocationCreateInfo stagingAllocCreateInfo = {
-        .flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_MAPPED_BIT,
-        .usage = VMA_MEMORY_USAGE_AUTO,
-    };
-
-    VmaAllocationInfo stagingResultInfo;
-    vmaCreateBuffer(allocator, &stagingBufferInfo, &stagingAllocCreateInfo, &stagingBuffer, &stagingAlloc, &stagingResultInfo);
-
-    // Copy raw pixels into the mapped memory provided by VMA
-    memcpy(stagingResultInfo.pMappedData, pixels, imageSize);
-
-    // --- 2. Create GPU Image (Device Local / Tiled) ---
-    VkExtent3D imageExtent = { (uint32_t) w, (uint32_t) h, 1 };
-
-    VkImageCreateInfo imageInfo = {
-        .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
-        .imageType = VK_IMAGE_TYPE_2D,
-        .format = VK_FORMAT_R8G8B8A8_UNORM,
-        .extent = imageExtent,
-        .mipLevels = 1,
-        .arrayLayers = 1,
-        .samples = VK_SAMPLE_COUNT_1_BIT,
-        .tiling = VK_IMAGE_TILING_OPTIMAL,
-        .usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT,
-        .initialLayout = VK_IMAGE_LAYOUT_UNDEFINED
-    };
-
-    VmaAllocationCreateInfo imageAllocCreateInfo = {
-        .usage = VMA_MEMORY_USAGE_AUTO,
-        .priority = 1.0f,
-    };
-
-    vmaCreateImage(allocator, &imageInfo, &imageAllocCreateInfo, image, allocation, nullptr);
-
-    // --- 3. The Transfer ---
-    immediate_submit([&](VkCommandBuffer cmd) {
-        // Transition image from UNDEFINED to TRANSFER_DST
-        transition_image_layout(cmd, *image, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
-
-        VkBufferImageCopy copyRegion = {};
-        copyRegion.bufferOffset = 0;
-        copyRegion.bufferRowLength = 0;
-        copyRegion.bufferImageHeight = 0;
-        copyRegion.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
-        copyRegion.imageSubresource.mipLevel = 0;
-        copyRegion.imageSubresource.baseArrayLayer = 0;
-        copyRegion.imageSubresource.layerCount = 1;
-        copyRegion.imageExtent = imageExtent;
-
-        vkCmdCopyBufferToImage(cmd, stagingBuffer, *image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &copyRegion);
-
-        // Transition image from TRANSFER_DST to SHADER_READ_ONLY
-        transition_image_layout(cmd, *image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
-    });
-
-    // Clean up temporary staging resources
-    vmaDestroyBuffer(allocator, stagingBuffer, stagingAlloc);
-
-    // --- 4. Finalize Handles ---
-    *view = create_image_view(*image, imageInfo.format);
-
-    // Register in your Bindless Array (Set 0, Binding 0, Index N)
-    *descriptor_index = nextTextureSlot++;
-    update_bindless_slot(*descriptor_index, *view, defaultSampler);
-}
-
 void Renderer::immediate_submit(std::function<void(VkCommandBuffer)>&& func) const {
     VkCommandBufferAllocateInfo allocInfo{ .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO };
     allocInfo.commandPool = frames[currentFrame].commandPool; // Use a pool created with VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT

renderer/vulkan/renderer.h

@@ -5,9 +5,13 @@
 #ifndef V_RENDERER_H
 #define V_RENDERER_H
 
-#include "init.h"
+#include "vulkan.h"
 #include <volk/volk.h>
+#ifdef __EMSCRIPTEN__
+#include <GLFW/emscripten_glfw3.h>
+#else
 #include <GLFW/glfw3.h>
+#endif
 #define GLM_FORCE_RADIANS
 #define GLM_FORCE_DEPTH_ZERO_TO_ONE
 #define GLM_ENABLE_EXPERIMENTAL
@@ -16,14 +20,10 @@
 #include "glm/gtx/string_cast.hpp"
 #include <vma/vk_mem_alloc.h>
 #include "../sprite.h"
-#include "texture.h"
+#include "../texture.h"
 #include <misc.h>
 #include <array>
 #include <span>
-#include <slang/slang.h>
-#include <slang/slang-com-ptr.h>
-
-inline Slang::ComPtr<slang::IGlobalSession> slangGlobalSession;
 
 enum class PROJECTION_TYPE : uint8_t {
     NONE,
@@ -208,16 +208,6 @@ struct Renderer {
     void create_descriptor_pool();
     void update_bindless_slot(uint32_t slot, VkImageView view, VkSampler sampler) const;
 
-    // Returns the resource info so the Manager can store it
-    void upload_texture(
-        int w,
-        int h,
-        const void* pixels,
-        VkImage *image,
-        VmaAllocation *allocation,
-        VkImageView *view,
-        uint32_t *descriptor_index);
-
     template <typename T>
     VkPipeline create_graphics_pipeline(
         VkDevice device,

renderer/vulkan/vulkan.cpp

@@ -7,7 +7,7 @@
 #define VMA_IMPLEMENTATION
 #include <vma/vk_mem_alloc.h>
 
-#include "init.h"
+#include "vulkan.h"
 #include <print>
 #include <vector>
 
@@ -39,6 +39,88 @@ std::vector<VkImage> images;
 std::vector<VkImageView> imageViews;
 std::vector<VkImageLayout> imageLayouts;
 
+void upload_texture(
+    const int w,
+    const int h,
+    const void* pixels,
+    Texture *texture)
+{
+    VkDeviceSize imageSize = w * h * 4;
+
+    // --- 1. Create Staging Buffer (CPU Visible) ---
+    VkBuffer stagingBuffer;
+    VmaAllocation stagingAlloc;
+
+    VkBufferCreateInfo stagingBufferInfo = { .sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO };
+    stagingBufferInfo.size = imageSize;
+    stagingBufferInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
+
+    VmaAllocationCreateInfo stagingAllocCreateInfo = {
+        .flags = VMA_ALLOCATION_CREATE_HOST_ACCESS_SEQUENTIAL_WRITE_BIT | VMA_ALLOCATION_CREATE_MAPPED_BIT,
+        .usage = VMA_MEMORY_USAGE_AUTO,
+    };
+
+    VmaAllocationInfo stagingResultInfo;
+    vmaCreateBuffer(allocator, &stagingBufferInfo, &stagingAllocCreateInfo, &stagingBuffer, &stagingAlloc, &stagingResultInfo);
+
+    // Copy raw pixels into the mapped memory provided by VMA
+    memcpy(stagingResultInfo.pMappedData, pixels, imageSize);
+
+    // --- 2. Create GPU Image (Device Local / Tiled) ---
+    VkExtent3D imageExtent = { (uint32_t) w, (uint32_t) h, 1 };
+
+    VkImageCreateInfo imageInfo = {
+        .sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
+        .imageType = VK_IMAGE_TYPE_2D,
+        .format = VK_FORMAT_R8G8B8A8_UNORM,
+        .extent = imageExtent,
+        .mipLevels = 1,
+        .arrayLayers = 1,
+        .samples = VK_SAMPLE_COUNT_1_BIT,
+        .tiling = VK_IMAGE_TILING_OPTIMAL,
+        .usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT,
+        .initialLayout = VK_IMAGE_LAYOUT_UNDEFINED
+    };
+
+    VmaAllocationCreateInfo imageAllocCreateInfo = {
+        .usage = VMA_MEMORY_USAGE_AUTO,
+        .priority = 1.0f,
+    };
+
+    vmaCreateImage(allocator, &imageInfo, &imageAllocCreateInfo, image, allocation, nullptr);
+
+    // --- 3. The Transfer ---
+    immediate_submit([&](VkCommandBuffer cmd) {
+        // Transition image from UNDEFINED to TRANSFER_DST
+        transition_image_layout(cmd, *image, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);
+
+        VkBufferImageCopy copyRegion = {};
+        copyRegion.bufferOffset = 0;
+        copyRegion.bufferRowLength = 0;
+        copyRegion.bufferImageHeight = 0;
+        copyRegion.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
+        copyRegion.imageSubresource.mipLevel = 0;
+        copyRegion.imageSubresource.baseArrayLayer = 0;
+        copyRegion.imageSubresource.layerCount = 1;
+        copyRegion.imageExtent = imageExtent;
+
+        vkCmdCopyBufferToImage(cmd, stagingBuffer, *image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &copyRegion);
+
+        // Transition image from TRANSFER_DST to SHADER_READ_ONLY
+        transition_image_layout(cmd, *image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
+    });
+
+    // Clean up temporary staging resources
+    vmaDestroyBuffer(allocator, stagingBuffer, stagingAlloc);
+
+    // --- 4. Finalize Handles ---
+    *view = create_image_view(*image, imageInfo.format);
+
+    // Register in your Bindless Array (Set 0, Binding 0, Index N)
+    *descriptor_index = nextTextureSlot++;
+    update_bindless_slot(*descriptor_index, *view, defaultSampler);
+}
+
 void graphics_init() {
     createInstance(window);
     createSurface(window);
@@ -46,10 +128,7 @@ void graphics_init() {
 
     createSwapchain(window);
 
-    slang::createGlobalSession(slangGlobalSession.writeRef());
-
     Renderer renderer(window);
-    texture_manager.load("assets/boy.png", renderer);
 }
 
 void graphics_deinit() {

renderer/vulkan/vulkan.h

@@ -2,8 +2,8 @@
 // Created by Vicente Ferrari Smith on 12.02.26.
 //
 
-#ifndef V_INIT_H
-#define V_INIT_H
+#ifndef V_VULKAN_H
+#define V_VULKAN_H
 
 #include <volk/volk.h>
 #include <GLFW/glfw3.h>
@@ -22,4 +22,4 @@ void pickPhysicalDevice();
 void createDevice();
 
 
-#endif //V_INIT_H
+#endif //V_VULKAN_H