From 41a0e60064d06a3ebe85d19277e1eadb247cb4e1 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 24 Jun 2023 08:47:13 +0530 Subject: [PATCH] Make bg_alpha always available --- kitty/cell_defines.glsl | 4 ---- kitty/cell_fragment.glsl | 2 -- kitty/cell_vertex.glsl | 3 +-- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/kitty/cell_defines.glsl b/kitty/cell_defines.glsl index 02580105e..0bc4f4a34 100644 --- a/kitty/cell_defines.glsl +++ b/kitty/cell_defines.glsl @@ -29,7 +29,3 @@ #if (HAS_TRANSPARENCY == 1) #define TRANSPARENT #endif - -#if defined(TRANSPARENT) || (PHASE == PHASE_SPECIAL) -#define NEEDS_BG_ALPHA -#endif diff --git a/kitty/cell_fragment.glsl b/kitty/cell_fragment.glsl index 30918c816..f96c83e5b 100644 --- a/kitty/cell_fragment.glsl +++ b/kitty/cell_fragment.glsl @@ -4,9 +4,7 @@ in vec3 background; in float draw_bg; -#ifdef NEEDS_BG_ALPHA in float bg_alpha; -#endif #ifdef NEEDS_FOREGROUND uniform sampler2DArray sprites; diff --git a/kitty/cell_vertex.glsl b/kitty/cell_vertex.glsl index d49803e49..5ea8fa3a9 100644 --- a/kitty/cell_vertex.glsl +++ b/kitty/cell_vertex.glsl @@ -36,9 +36,7 @@ const uvec2 cell_pos_map[] = uvec2[4]( out vec3 background; out float draw_bg; -#ifdef NEEDS_BG_ALPHA out float bg_alpha; -#endif #ifdef NEEDS_FOREGROUND uniform float inactive_text_alpha; @@ -206,6 +204,7 @@ void main() { draw_bg = step(1, float(draw_bg_bitfield & draw_bg_mask)); #endif + bg_alpha = 1.f; #ifdef TRANSPARENT // Set bg_alpha to background_opacity on cells that have the default background color // Which means they must not have a block cursor or a selection or reverse video