Merge: 9P rounds 9-17 + render DPI, dark tints, G4-G10

1 files changed, 29 insertions, 2 deletions

diff --git a/shaders/post/prefix.glsl b/shaders/post/prefix.glsl
index e718a98f..44c5e0f8 100644
--- a/shaders/post/prefix.glsl
+++ b/shaders/post/prefix.glsl
@@ -30,7 +30,14 @@ layout(set = 3, binding = 0, std140) uniform Globals {
     uniform float iTimeCursorChange;
     uniform float iTimeFocus;
     uniform int iFocus;
+};
+// ghostty's one block, cut in three: SDL GPU binds at most 4 KiB of a
+// uniform block (Vulkan), and the palette alone is 4 KiB. The names and
+// their order are ghostty's; each block is a slice of the same memory.
+layout(set = 3, binding = 1, std140) uniform Palette {
     uniform vec3  iPalette[256];
+};
+layout(set = 3, binding = 2, std140) uniform Colors {
     uniform vec3  iBackgroundColor;
     uniform vec3  iForegroundColor;
     uniform vec3  iCursorColor;
@@ -41,12 +48,32 @@ layout(set = 3, binding = 0, std140) uniform Globals {
 
 // pardes's own: pardesOpaque is 1 when the window is opaque, so a pass
 // cannot punch holes in it through its alpha; pardesLevel is a bundled
-// pass's strength, 1 to 3 (`Crt 3`), and 0 for a user's file.
-layout(set = 3, binding = 1, std140) uniform PardesPost {
+// pass's strength, 1 to 3 (`Crt 3`), and 0 for a user's file; pardesScale
+// is the display's density (2 on a 2x screen), for a pass whose pattern is
+// in logical pixels. iResolution, fragCoord and iMouse stay in the display's
+// pixels, as ghostty's do. pardesCap is the most a bundled pass may do on
+// this theme and still leave its text, and its selection's, at their own
+// contrast or 4.5 (docs/effects.md); pardesSpare holds pardesSpareCount
+// rectangles (x0, y0, x1, y1 in fragCoord's pixels) a bundled pass leaves
+// alone: every tag, grip and notice, and the cursor, so no pass ever touches
+// a focus indicator.
+layout(set = 3, binding = 3, std140) uniform PardesPost {
     float pardesOpaque;
     float pardesLevel;
+    float pardesScale;
+    float pardesCap;
+    float pardesSpareCount;
+    vec4 pardesSpare[32];
 };
 
+bool pardesSpared(vec2 p) {
+    for (int i = 0; i < int(pardesSpareCount); i++) {
+        vec4 r = pardesSpare[i];
+        if (p.x >= r.x && p.y >= r.y && p.x < r.z && p.y < r.w) return true;
+    }
+    return false;
+}
+
 // A bundled pass's constant at levels 1, 2 and 3.
 float pardesByLevel(float one, float two, float three) {
     return pardesLevel < 1.5 ? one : (pardesLevel < 2.5 ? two : three);