birth-software/bloat-buster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix non-uniform indexing

Browse Source
This commit is contained in:
David Gonzalez Martin 2024-12-03 20:03:44 -06:00 committed by David
parent 4035da283c
commit 3e56493872
3 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
bootstrap/bloat-buster/bb_core.c
View File

@ -177,41 +177,41 @@ void run_app()
renderer_window_frame_begin(renderer, render_window); renderer_window_frame_begin(renderer, render_window);
// u32 box_width = 10; u32 box_width = 10;
// u32 box_height = 10; u32 box_height = 10;
// auto box_color = Color4(1, 0, 0, 1); auto box_color = Color4(1, 0, 0, 1);
//
// Vertex box_vertices[] = { Vertex box_vertices[] = {
// { {
// .x = mouse_position.x, .x = mouse_position.x,
// .y = mouse_position.y, .y = mouse_position.y,
// .color = box_color, .color = box_color,
// }, },
// { {
// .x = mouse_position.x + box_width, .x = mouse_position.x + box_width,
// .y = mouse_position.y, .y = mouse_position.y,
// .color = box_color, .color = box_color,
// }, },
// { {
// .x = mouse_position.x, .x = mouse_position.x,
// .y = mouse_position.y + box_height, .y = mouse_position.y + box_height,
// .color = box_color, .color = box_color,
// }, },
// { {
// .x = mouse_position.x + box_width, .x = mouse_position.x + box_width,
// .y = mouse_position.y + box_height, .y = mouse_position.y + box_height,
// .color = box_color, .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)); 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[] = { u32 box_indices[] = {
// vertex_offset + 0, vertex_offset + 1, vertex_offset + 2, vertex_offset + 0, vertex_offset + 1, vertex_offset + 2,
// vertex_offset + 1, vertex_offset + 3, 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)); 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); 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); renderer_window_frame_end(renderer, render_window);

4
bootstrap/shaders/font.frag
View File

@ -14,9 +14,9 @@ layout(set = 0, binding = 0) uniform sampler2D textures[];
void main() 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); 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); // 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; out_frag_color = in_color * sampled;
} }

4
bootstrap/std/render.c
View File

@ -999,6 +999,7 @@ Renderer* renderer_initialize(Arena* arena)
.bufferDeviceAddress = 1, .bufferDeviceAddress = 1,
.descriptorIndexing = 1, .descriptorIndexing = 1,
.runtimeDescriptorArray = 1, .runtimeDescriptorArray = 1,
.shaderSampledImageArrayNonUniformIndexing = 1,
.pNext = &features13, .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) void renderer_window_frame_end(Renderer* renderer, RenderWindow* window)
{ {
auto* frame = window_frame(window); auto* frame = window_frame(window);
// print("Frame index: {u32}\n", window->frame_index);
VkCommandBufferBeginInfo command_buffer_begin_info = { VkCommandBufferBeginInfo command_buffer_begin_info = {
.sType = VK_STRUCTURE_TYPE_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); vk_image_transition(frame->command_buffer, window->render_image.handle, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
VkViewport viewports[] = { VkViewport viewports[] = {