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

Reorganize shader data layout

Browse Source
This commit is contained in:
David Gonzalez Martin 2024-12-21 21:17:27 -06:00 committed by David
parent e742e595a4
commit 1f87446591
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bootstrap/shaders/font.frag
View File

@ -1,22 +1,21 @@
#version 450 #version 450
#extension GL_EXT_nonuniform_qualifier : require #extension GL_EXT_nonuniform_qualifier : require
#extension GL_EXT_debug_printf : require #extension GL_EXT_debug_printf : require
#extension GL_GOOGLE_include_directive : require
//shader input #include "font.h"
layout (location = 0) in vec4 in_color;
layout (location = 1) in vec2 in_screen_uv;
layout (location = 2) in flat uint texture_index;
//output write layout (location = 0) in flat uint texture_index;
layout (location = 0) out vec4 out_frag_color; layout (location = 1) in FragmentShaderInput inputs;
layout (location = 0) out vec4 color;
layout(set = 0, binding = 0) uniform sampler2D textures[]; layout(set = 0, binding = 0) uniform sampler2D textures[];
void main() void main()
{ {
vec2 texture_size = textureSize(textures[nonuniformEXT(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(inputs.uv.x / texture_size.x, inputs.uv.y / texture_size.y);
vec4 sampled = texture(textures[nonuniformEXT(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); color = inputs.color * sampled;
out_frag_color = in_color * sampled;
} }

5
bootstrap/shaders/font.h Normal file
View File

@ -0,0 +1,5 @@
struct FragmentShaderInput
{
vec4 color;
vec2 uv;
};

17
bootstrap/shaders/font.vert
View File

@ -1,10 +1,12 @@
#version 450 #version 450
#extension GL_EXT_buffer_reference : require #extension GL_EXT_buffer_reference : require
#extension GL_EXT_debug_printf : require #extension GL_EXT_debug_printf : require
#extension GL_GOOGLE_include_directive : require
layout (location = 0) out vec4 out_color; #include "font.h"
layout (location = 1) out vec2 out_uv;
layout (location = 2) out uint out_texture_index; layout (location = 0) out uint texture_index;
layout (location = 1) out FragmentShaderInput outputs;
struct Vertex { struct Vertex {
float x; float x;
@ -34,11 +36,12 @@ void main()
float width = PushConstants.width; float width = PushConstants.width;
float height = PushConstants.height; float height = PushConstants.height;
//output data
gl_Position = vec4(2 * v.x / width - 1, 2 * v.y / height - 1, 0, 1); gl_Position = vec4(2 * v.x / width - 1, 2 * v.y / height - 1, 0, 1);
out_uv = vec2(v.uv_x, v.uv_y);
out_color = v.colors[gl_VertexIndex % 4]; outputs.uv = vec2(v.uv_x, v.uv_y);
out_texture_index = v.texture_index; outputs.color = v.colors[gl_VertexIndex % 4];
texture_index = v.texture_index;
//debugPrintfEXT("Vertex index: (%u)\n", gl_VertexIndex); //debugPrintfEXT("Vertex index: (%u)\n", gl_VertexIndex);
//debugPrintfEXT("UV: (%f, %f)\n", v.uv_x, v.uv_y); //debugPrintfEXT("UV: (%f, %f)\n", v.uv_x, v.uv_y);
} }