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

Normalize textures on shader code

Browse Source
This commit is contained in:
David Gonzalez Martin 2024-11-30 20:37:01 -06:00 committed by David
parent e499826c1f
commit 6151efb0b5
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,35 +49,37 @@ fn void draw_string(Renderer* renderer, VirtualBuffer(Vertex)* vertices, Virtual
auto uv_width = character->width; auto uv_width = character->width;
auto uv_height = character->height; auto uv_height = character->height;
print("UV x: {u32}. UV y: {u32}\n", uv_x, uv_y);
*vb_add(vertices, 1) = (Vertex) { *vb_add(vertices, 1) = (Vertex) {
.x = pos_x, .x = pos_x,
.y = pos_y, .y = pos_y,
.uv_x = (f32)uv_x / texture_atlas.width, .uv_x = (f32)uv_x,
.uv_y = (f32)uv_y / texture_atlas.width, .uv_y = (f32)uv_y,
.color = color, .color = color,
.texture_index = texture_index, .texture_index = texture_index,
}; };
*vb_add(vertices, 1) = (Vertex) { *vb_add(vertices, 1) = (Vertex) {
.x = pos_x + character->width, .x = pos_x + character->width,
.y = pos_y, .y = pos_y,
.uv_x = (f32)(uv_x + uv_width) / texture_atlas.width, .uv_x = (f32)(uv_x + uv_width),
.uv_y = (f32)uv_y / texture_atlas.width, .uv_y = (f32)uv_y,
.color = color, .color = color,
.texture_index = texture_index, .texture_index = texture_index,
}; };
*vb_add(vertices, 1) = (Vertex) { *vb_add(vertices, 1) = (Vertex) {
.x = pos_x, .x = pos_x,
.y = pos_y + character->height, .y = pos_y + character->height,
.uv_x = (f32)uv_x / texture_atlas.width, .uv_x = (f32)uv_x,
.uv_y = (f32)(uv_y + uv_height) / texture_atlas.width, .uv_y = (f32)(uv_y + uv_height),
.color = color, .color = color,
.texture_index = texture_index, .texture_index = texture_index,
}; };
*vb_add(vertices, 1) = (Vertex) { *vb_add(vertices, 1) = (Vertex) {
.x = pos_x + character->width, .x = pos_x + character->width,
.y = pos_y + character->height, .y = pos_y + character->height,
.uv_x = (f32)(uv_x + uv_width) / texture_atlas.width, .uv_x = (f32)(uv_x + uv_width),
.uv_y = (f32)(uv_y + uv_height) / texture_atlas.width, .uv_y = (f32)(uv_y + uv_height),
.color = color, .color = color,
.texture_index = texture_index, .texture_index = texture_index,
}; };

9
bootstrap/shaders/font.frag
View File

@ -1,10 +1,10 @@
#version 450 #version 450
#extension GL_EXT_nonuniform_qualifier : require #extension GL_EXT_nonuniform_qualifier : require
#extension GL_EXT_debug_printf : require
//shader input //shader input
layout (location = 0) in vec4 in_color; layout (location = 0) in vec4 in_color;
layout (location = 1) in vec2 in_uv; layout (location = 1) in vec2 in_screen_uv;
layout (location = 2) in flat uint texture_index; layout (location = 2) in flat uint texture_index;
//output write //output write
@ -14,6 +14,9 @@ layout(set = 0, binding = 0) uniform sampler2D textures[];
void main() void main()
{ {
vec4 sampled = texture(textures[texture_index], in_uv); vec2 texture_size = textureSize(textures[texture_index], 0);
//debugPrintfEXT("texture uv: (%f, %f)\n", in_screen_uv.x, in_screen_uv.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);
out_frag_color = in_color * sampled; out_frag_color = in_color * sampled;
} }

2
bootstrap/std/render.c
View File

@ -547,7 +547,7 @@ Renderer* renderer_initialize()
.pUserData = 0, .pUserData = 0,
}; };
u8 enable_shader_debug_printf = 0; u8 enable_shader_debug_printf = BB_DEBUG;
VkValidationFeaturesEXT validation_features = { VkValidationFeaturesEXT validation_features = {
.sType = VK_STRUCTURE_TYPE_VALIDATION_FEATURES_EXT, .sType = VK_STRUCTURE_TYPE_VALIDATION_FEATURES_EXT,