From 3e56493872735e3c3a46ab3c27506cddaa802c59 Mon Sep 17 00:00:00 2001
From: David Gonzalez Martin <davidgm94.work@protonmail.com>
Date: Tue, 3 Dec 2024 20:03:44 -0600
Subject: [PATCH] Fix non-uniform indexing

---
 bootstrap/bloat-buster/bb_core.c | 70 ++++++++++++++++----------------
 bootstrap/shaders/font.frag      |  4 +-
 bootstrap/std/render.c           |  4 +-
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/bootstrap/bloat-buster/bb_core.c b/bootstrap/bloat-buster/bb_core.c
index 73e0aa0..4c777e5 100644
--- a/bootstrap/bloat-buster/bb_core.c
+++ b/bootstrap/bloat-buster/bb_core.c
@@ -177,41 +177,41 @@ void run_app()
 
         renderer_window_frame_begin(renderer, render_window);
 
-        // u32 box_width = 10;
-        // u32 box_height = 10;
-        // auto box_color = Color4(1, 0, 0, 1);
-        // 
-        // Vertex box_vertices[] = {
-        //     {
-        //         .x = mouse_position.x,
-        //         .y = mouse_position.y,
-        //         .color = box_color,
-        //     },
-        //     {
-        //         .x = mouse_position.x + box_width,
-        //         .y = mouse_position.y,
-        //         .color = box_color,
-        //     },
-        //     {
-        //         .x = mouse_position.x,
-        //         .y = mouse_position.y + box_height,
-        //         .color = box_color,
-        //     },
-        //     {
-        //         .x = mouse_position.x + box_width,
-        //         .y = mouse_position.y + box_height,
-        //         .color = box_color,
-        //     },
-        // };
-        //
-        // auto vertex_offset = window_pipeline_add_vertices(render_window, BB_PIPELINE_RECT, (String)array_to_bytes(box_vertices), array_length(box_vertices));
-        //
-        // u32 box_indices[] = {
-        //     vertex_offset + 0, vertex_offset + 1, vertex_offset + 2,
-        //     vertex_offset + 1, vertex_offset + 3, vertex_offset + 2,
-        // };
-        //
-        // window_pipeline_add_indices(render_window, BB_PIPELINE_RECT, (Slice(u32))array_to_slice(box_indices));
+        u32 box_width = 10;
+        u32 box_height = 10;
+        auto box_color = Color4(1, 0, 0, 1);
+
+        Vertex box_vertices[] = {
+            {
+                .x = mouse_position.x,
+                .y = mouse_position.y,
+                .color = box_color,
+            },
+            {
+                .x = mouse_position.x + box_width,
+                .y = mouse_position.y,
+                .color = box_color,
+            },
+            {
+                .x = mouse_position.x,
+                .y = mouse_position.y + box_height,
+                .color = box_color,
+            },
+            {
+                .x = mouse_position.x + box_width,
+                .y = mouse_position.y + box_height,
+                .color = box_color,
+            },
+        };
+
+        auto vertex_offset = window_pipeline_add_vertices(render_window, BB_PIPELINE_RECT, (String)array_to_bytes(box_vertices), array_length(box_vertices));
+
+        u32 box_indices[] = {
+            vertex_offset + 0, vertex_offset + 1, vertex_offset + 2,
+            vertex_offset + 1, vertex_offset + 3, vertex_offset + 2,
+        };
+
+        window_pipeline_add_indices(render_window, BB_PIPELINE_RECT, (Slice(u32))array_to_slice(box_indices));
         draw_string(render_window, Color4(0, 0, 0, 1), strlit("abcdefghijklmnopqrstuvwxyz!"), monospace_font, RECT_TEXTURE_SLOT_MONOSPACE_FONT, 100, 100);
 
         renderer_window_frame_end(renderer, render_window);
diff --git a/bootstrap/shaders/font.frag b/bootstrap/shaders/font.frag
index 30bd07b..d0bfc20 100644
--- a/bootstrap/shaders/font.frag
+++ b/bootstrap/shaders/font.frag
@@ -14,9 +14,9 @@ layout(set = 0, binding = 0) uniform sampler2D textures[];
 
 void main() 
 {
-    vec2 texture_size = textureSize(textures[texture_index], 0);
+    vec2 texture_size = textureSize(textures[nonuniformEXT(texture_index)], 0);
     vec2 uv = vec2(in_screen_uv.x / texture_size.x, in_screen_uv.y / texture_size.y);
-    vec4 sampled = texture(textures[texture_index], uv);
+    vec4 sampled = texture(textures[nonuniformEXT(texture_index)], uv);
     // debugPrintfEXT("In color: (%f, %f, %f, %f). Sampled: (%f, %f, %f, %f)\n", in_color.x, in_color.y, in_color.z, in_color.w, sampled.x, sampled.y, sampled.z, sampled.w);
     out_frag_color = in_color * sampled;
 }
diff --git a/bootstrap/std/render.c b/bootstrap/std/render.c
index f9a94b3..70a840c 100644
--- a/bootstrap/std/render.c
+++ b/bootstrap/std/render.c
@@ -999,6 +999,7 @@ Renderer* renderer_initialize(Arena* arena)
             .bufferDeviceAddress = 1,
             .descriptorIndexing = 1,
             .runtimeDescriptorArray = 1,
+            .shaderSampledImageArrayNonUniformIndexing = 1,
             .pNext = &features13,
         };
 
@@ -1732,7 +1733,6 @@ fn void buffer_ensure_capacity(Renderer* renderer, VulkanBuffer* buffer, u64 nee
 void renderer_window_frame_end(Renderer* renderer, RenderWindow* window)
 {
     auto* frame = window_frame(window);
-    // print("Frame index: {u32}\n", window->frame_index);
 
     VkCommandBufferBeginInfo command_buffer_begin_info = {
         .sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO,
@@ -1797,7 +1797,7 @@ void renderer_window_frame_end(Renderer* renderer, RenderWindow* window)
             })));
         }
     }
-
+    
     vk_image_transition(frame->command_buffer, window->render_image.handle, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
 
     VkViewport viewports[] = {