From 8c928841ad356763d15d731e5eee99384f5c815e Mon Sep 17 00:00:00 2001 From: Andreew Gregory Date: Wed, 11 Feb 2026 19:12:49 +0300 Subject: [PATCH] Fixed dumb color blending bug in margaret. Discovered it when set non-black wallpaper --- src/l2/margaret/vulkan_utils.h | 2 +- src/l_adele/lucy/lucy.frag | 1 - src/l_adele/lucy/lucy.vert | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/l2/margaret/vulkan_utils.h b/src/l2/margaret/vulkan_utils.h index 8168c44..72b26d4 100644 --- a/src/l2/margaret/vulkan_utils.h +++ b/src/l2/margaret/vulkan_utils.h @@ -1120,7 +1120,7 @@ VkPipeline margaret_create_triangle_pipeline_one_attachment( .dstColorBlendFactor = VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA, .colorBlendOp = VK_BLEND_OP_ADD, .srcAlphaBlendFactor = VK_BLEND_FACTOR_ONE, - .dstAlphaBlendFactor = VK_BLEND_FACTOR_ZERO, + .dstAlphaBlendFactor = VK_BLEND_FACTOR_ONE, .alphaBlendOp = VK_BLEND_OP_ADD, .colorWriteMask = VK_COLOR_COMPONENT_R_BIT | VK_COLOR_COMPONENT_G_BIT | VK_COLOR_COMPONENT_B_BIT | VK_COLOR_COMPONENT_A_BIT diff --git a/src/l_adele/lucy/lucy.frag b/src/l_adele/lucy/lucy.frag index 5725fa3..24272f9 100644 --- a/src/l_adele/lucy/lucy.frag +++ b/src/l_adele/lucy/lucy.frag @@ -13,5 +13,4 @@ layout (binding=0) uniform sampler2D images[]; void main(){ float I = texture(images[nonuniformEXT(tex_ind)], tex_cord).r; fin_color = vec4(color.rgb, color.a * I); - //fin_color = vec4(0, 0, 0, 1); } diff --git a/src/l_adele/lucy/lucy.vert b/src/l_adele/lucy/lucy.vert index b02e6a3..788fc91 100644 --- a/src/l_adele/lucy/lucy.vert +++ b/src/l_adele/lucy/lucy.vert @@ -38,4 +38,5 @@ void main(){ vsout_tex_ind = tex_ind; vec2 pos = all_v_pos[gl_VertexIndex % 6]; gl_Position = vec4(deng(width, pos.x), deng(height, pos.y), 0, 1); + }