diff --git a/libs/video/renderer/Makemodule.am b/libs/video/renderer/Makemodule.am index 17e86d3fc..316f9449e 100644 --- a/libs/video/renderer/Makemodule.am +++ b/libs/video/renderer/Makemodule.am @@ -285,8 +285,6 @@ slice_src = $(vkshaderpath)/slice.vert slice_c = $(vkshaderpath)/slice.vert.spvc glyphv_src = $(vkshaderpath)/glyph.vert glyphv_c = $(vkshaderpath)/glyph.vert.spvc -glyphf_src = $(vkshaderpath)/glyph.frag -glyphf_c = $(vkshaderpath)/glyph.frag.spvc linev_src = $(vkshaderpath)/line.vert linev_c = $(vkshaderpath)/line.vert.spvc linef_src = $(vkshaderpath)/line.frag @@ -373,7 +371,6 @@ waterwarp_c = $(vkshaderpath)/waterwarp.frag.spvc $(slice_vert_c): $(slice_vert_src) $(matrices_h) $(glyphv_c): $(glyphv_src) $(matrices_h) -$(glyphf_c): $(glyphf_src) $(linev_c): $(linev_src) $(matrices_h) $(linef_c): $(linef_src) @@ -449,7 +446,6 @@ $(waterwarp_c): $(waterwarp_src) $(matrices_h) vkshader_c = \ $(slice_c) \ $(glyphv_c) \ - $(glyphf_c) \ $(linev_c) \ $(linef_c) \ $(partphysicsc_c) \ @@ -535,7 +531,6 @@ EXTRA_DIST += \ $(entity_h) \ $(slice_src) \ $(glyphv_src) \ - $(glyphf_src) \ $(linev_src) \ $(linef_src) \ $(partphysicsc_src) \ diff --git a/libs/video/renderer/vulkan/pl_quake_def.plist b/libs/video/renderer/vulkan/pl_quake_def.plist index 463addd10..dcd8f55fe 100644 --- a/libs/video/renderer/vulkan/pl_quake_def.plist +++ b/libs/video/renderer/vulkan/pl_quake_def.plist @@ -1190,7 +1190,7 @@ subpass = 0; stages = ( { stage = vertex; name = main; module = $builtin/slice.vert; }, - { stage = fragment; name = main; module = $builtin/glyph.frag; }, + { stage = fragment; name = main; module = $builtin/twod.frag; }, ); vertexInput = $properties.vertexInput.slice; inputAssembly = { @@ -1211,7 +1211,7 @@ subpass = 0; stages = ( { stage = vertex; name = main; module = $builtin/glyph.vert; }, - { stage = fragment; name = main; module = $builtin/glyph.frag; }, + { stage = fragment; name = main; module = $builtin/twod.frag; }, ); vertexInput = $properties.vertexInput.glyph; inputAssembly = { diff --git a/libs/video/renderer/vulkan/shader.c b/libs/video/renderer/vulkan/shader.c index 133f23517..954e386ae 100644 --- a/libs/video/renderer/vulkan/shader.c +++ b/libs/video/renderer/vulkan/shader.c @@ -43,8 +43,6 @@ static static #include "libs/video/renderer/vulkan/shader/glyph.vert.spvc" static -#include "libs/video/renderer/vulkan/shader/glyph.frag.spvc" -static #include "libs/video/renderer/vulkan/shader/line.vert.spvc" static #include "libs/video/renderer/vulkan/shader/line.frag.spvc" @@ -130,7 +128,6 @@ typedef struct shaderdata_s { static shaderdata_t builtin_shaders[] = { { "slice.vert", slice_vert, sizeof (slice_vert) }, { "glyph.vert", glyph_vert, sizeof (glyph_vert) }, - { "glyph.frag", glyph_frag, sizeof (glyph_frag) }, { "line.vert", line_vert, sizeof (line_vert) }, { "line.frag", line_frag, sizeof (line_frag) }, { "particle.vert", particle_vert, sizeof (particle_vert) }, diff --git a/libs/video/renderer/vulkan/shader/glyph.frag b/libs/video/renderer/vulkan/shader/glyph.frag deleted file mode 100644 index 90b52e826..000000000 --- a/libs/video/renderer/vulkan/shader/glyph.frag +++ /dev/null @@ -1,17 +0,0 @@ -#version 450 - -layout (set = 1, binding = 0) uniform sampler2D Texture; - -layout (location = 0) in vec2 uv; -layout (location = 1) in vec4 color; - -layout (location = 0) out vec4 frag_color; - -void -main (void) -{ - vec4 pix; - - pix = texture (Texture, uv); - frag_color = pix * color; -}