From cf65443fb3102e7d128fbb22ce3187feb52b9b2c Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Tue, 17 Jan 2017 05:36:03 +0100
Subject: [PATCH] vulkan: Add a clip.frag.glsl include

This include is supposed to handle clipping for the different clipping
methods.

So far, we only use it in the rounded rect cases.
---
 gsk/Makefile.am                               |   1 +
 .../vulkan/blend-clip-rounded.frag.glsl       |  47 ++---------------
 .../vulkan/blend-clip-rounded.frag.spv        | Bin 5464 -> 8268 bytes
 gsk/resources/vulkan/blend-clip.frag.spv      | Bin 632 -> 632 bytes
 gsk/resources/vulkan/clip.frag.glsl           |  29 +++++++++++
 .../vulkan/color-clip-rounded.frag.glsl       |  48 ++----------------
 .../vulkan/color-clip-rounded.frag.spv        | Bin 5552 -> 8356 bytes
 .../color-matrix-clip-rounded.frag.glsl       |  47 ++---------------
 .../vulkan/color-matrix-clip-rounded.frag.spv | Bin 6872 -> 9676 bytes
 .../vulkan/linear-clip-rounded.frag.glsl      |  47 ++---------------
 .../vulkan/linear-clip-rounded.frag.spv       | Bin 7032 -> 9836 bytes
 11 files changed, 42 insertions(+), 177 deletions(-)
 create mode 100644 gsk/resources/vulkan/clip.frag.glsl

diff --git a/gsk/Makefile.am b/gsk/Makefile.am
index 38148452de..dd480bfa4e 100644
--- a/gsk/Makefile.am
+++ b/gsk/Makefile.am
@@ -58,6 +58,7 @@ gsk_private_vulkan_source_c = \
 	gskvulkanrenderpass.c \
 	gskvulkanshader.c
 gsk_private_vulkan_include_shaders = \
+	resources/vulkan/clip.frag.glsl \
 	resources/vulkan/constants.glsl \
 	resources/vulkan/rounded-rect.glsl
 gsk_private_vulkan_shaders = \
diff --git a/gsk/resources/vulkan/blend-clip-rounded.frag.glsl b/gsk/resources/vulkan/blend-clip-rounded.frag.glsl
index 23ef1c83d7..81bd003923 100644
--- a/gsk/resources/vulkan/blend-clip-rounded.frag.glsl
+++ b/gsk/resources/vulkan/blend-clip-rounded.frag.glsl
@@ -1,11 +1,7 @@
 #version 420 core
 
-#include "constants.glsl"
-
-struct RoundedRect {
-  vec4 bounds;
-  vec4 corners;
-};
+#define CLIP_ROUNDED_RECT
+#include "clip.frag.glsl"
 
 layout(location = 0) in vec2 inPos;
 layout(location = 1) in vec2 inTexCoord;
@@ -14,44 +10,7 @@ layout(set = 0, binding = 0) uniform sampler2D inTexture;
 
 layout(location = 0) out vec4 color;
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-float clip(vec2 pos, RoundedRect r) {
-  vec2 ref_tl = r.bounds.xy + vec2( r.corners.x,  r.corners.x);
-  vec2 ref_tr = r.bounds.zy + vec2(-r.corners.y,  r.corners.y);
-  vec2 ref_br = r.bounds.zw + vec2(-r.corners.z, -r.corners.z);
-  vec2 ref_bl = r.bounds.xw + vec2( r.corners.w, -r.corners.w);
-  
-  float d_tl = distance(pos, ref_tl);
-  float d_tr = distance(pos, ref_tr);
-  float d_br = distance(pos, ref_br);
-  float d_bl = distance(pos, ref_bl);
-
-  float pixels_per_fragment = length(fwidth(pos.xy));
-  float nudge = 0.5 * pixels_per_fragment;
-  vec4 distances = vec4(d_tl, d_tr, d_br, d_bl) - r.corners + nudge;
-
-  bvec4 is_out = bvec4(pos.x < ref_tl.x && pos.y < ref_tl.y,
-                       pos.x > ref_tr.x && pos.y < ref_tr.y,
-                       pos.x > ref_br.x && pos.y > ref_br.y,
-                       pos.x < ref_bl.x && pos.y > ref_bl.y);
-
-  float distance_from_border = dot(vec4(is_out),
-                                   max(vec4(0.0, 0.0, 0.0, 0.0), distances));
-
-  // Move the distance back into pixels.
-  distance_from_border /= pixels_per_fragment;
-  // Apply a more gradual fade out to transparent.
-  //distance_from_border -= 0.5;
-
-  return 1.0 - smoothstep(0.0, 1.0, distance_from_border);
-}
-
 void main()
 {
-  RoundedRect r = RoundedRect(vec4(push.clip_bounds.xy, push.clip_bounds.xy + push.clip_bounds.zw), push.clip_widths);
-
-  color = texture (inTexture, inTexCoord) * clip (inPos, r);
+  color = clip (inPos, texture (inTexture, inTexCoord));
 }
diff --git a/gsk/resources/vulkan/blend-clip-rounded.frag.spv b/gsk/resources/vulkan/blend-clip-rounded.frag.spv
index adaa02be7221189fcce93b3845280f4d51f7ed1d..8b4b3b332e08eb6b9dc0e2057faf2217486d73f9 100644
GIT binary patch
literal 8268
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

literal 5464
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
ZaxZcpqL1HV?Vl?+{r<x&)%`!ge*ry01AqVk

diff --git a/gsk/resources/vulkan/blend-clip.frag.spv b/gsk/resources/vulkan/blend-clip.frag.spv
index 9dcff6d120b133e6c797fcb6a16399231a26177b..ef5dc6b6bfdf59d642833a33356328313b61db15 100644
GIT binary patch
delta 20
acmeyt@`Ht&nMs+Qfq@YSc{g(BG64WAngeYB

delta 20
acmeyt@`Ht&nMs+Qfq@YSIW}_VG64WAfdgm&

diff --git a/gsk/resources/vulkan/clip.frag.glsl b/gsk/resources/vulkan/clip.frag.glsl
new file mode 100644
index 0000000000..472dc6f58c
--- /dev/null
+++ b/gsk/resources/vulkan/clip.frag.glsl
@@ -0,0 +1,29 @@
+#include "constants.glsl"
+#include "rounded-rect.glsl"
+
+#ifndef _CLIP_
+#define _CLIP_
+
+#ifdef CLIP_ROUNDED_RECT
+vec4 clip(vec2 pos, vec4 color)
+{
+  RoundedRect r = RoundedRect(vec4(push.clip_bounds.xy, push.clip_bounds.xy + push.clip_bounds.zw), push.clip_widths, push.clip_heights);
+
+  return color * rounded_rect_coverage (r, pos);
+}
+#elif defined(CLIP_RECT)
+vec4 clip(vec2 pos, vec4 color)
+{
+  /* clipped in vertex shader already */
+  return color;
+}
+#elif defined(CLIP_NONE)
+vec4 clip(vec2 pos, vec4 color)
+{
+  return color;
+}
+#else
+#error "No clipping define given. Need CLIP_NONE, CLIP_RECT or CLIP_ROUNDED_RECT"
+#endif
+
+#endif
diff --git a/gsk/resources/vulkan/color-clip-rounded.frag.glsl b/gsk/resources/vulkan/color-clip-rounded.frag.glsl
index c1fa5038d5..b66001c9f5 100644
--- a/gsk/resources/vulkan/color-clip-rounded.frag.glsl
+++ b/gsk/resources/vulkan/color-clip-rounded.frag.glsl
@@ -1,56 +1,14 @@
 #version 420 core
 
-#include "constants.glsl"
+#define CLIP_ROUNDED_RECT
+#include "clip.frag.glsl"
 
 layout(location = 0) in vec2 inPos;
 layout(location = 1) in vec4 inColor;
 
 layout(location = 0) out vec4 color;
 
-struct RoundedRect {
-  vec4 bounds;
-  vec4 corners;
-};
-
-
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-float clip(vec2 pos, RoundedRect r) {
-  vec2 ref_tl = r.bounds.xy + vec2( r.corners.x,  r.corners.x);
-  vec2 ref_tr = r.bounds.zy + vec2(-r.corners.y,  r.corners.y);
-  vec2 ref_br = r.bounds.zw + vec2(-r.corners.z, -r.corners.z);
-  vec2 ref_bl = r.bounds.xw + vec2( r.corners.w, -r.corners.w);
-  
-  float d_tl = distance(pos, ref_tl);
-  float d_tr = distance(pos, ref_tr);
-  float d_br = distance(pos, ref_br);
-  float d_bl = distance(pos, ref_bl);
-
-  float pixels_per_fragment = length(fwidth(pos.xy));
-  float nudge = 0.5 * pixels_per_fragment;
-  vec4 distances = vec4(d_tl, d_tr, d_br, d_bl) - r.corners + nudge;
-
-  bvec4 is_out = bvec4(pos.x < ref_tl.x && pos.y < ref_tl.y,
-                       pos.x > ref_tr.x && pos.y < ref_tr.y,
-                       pos.x > ref_br.x && pos.y > ref_br.y,
-                       pos.x < ref_bl.x && pos.y > ref_bl.y);
-
-  float distance_from_border = dot(vec4(is_out),
-                                   max(vec4(0.0, 0.0, 0.0, 0.0), distances));
-
-  // Move the distance back into pixels.
-  distance_from_border /= pixels_per_fragment;
-  // Apply a more gradual fade out to transparent.
-  //distance_from_border -= 0.5;
-
-  return 1.0 - smoothstep(0.0, 1.0, distance_from_border);
-}
-
 void main()
 {
-  RoundedRect r = RoundedRect(vec4(push.clip_bounds.xy, push.clip_bounds.xy + push.clip_bounds.zw), push.clip_widths);
-
-  color = vec4(inColor.rgb * inColor.a, inColor.a) * clip (inPos, r);
+  color = clip (inPos, vec4(inColor.rgb * inColor.a, inColor.a));
 }
diff --git a/gsk/resources/vulkan/color-clip-rounded.frag.spv b/gsk/resources/vulkan/color-clip-rounded.frag.spv
index ce925764d411b2647b4da32cfbd0bc97748b9e85..74d6fb96894cef59830a853d900a8ff45c1e89ef 100644
GIT binary patch
literal 8356
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
N*fsQf9_60L{{v*)8y^4w

literal 5552
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

diff --git a/gsk/resources/vulkan/color-matrix-clip-rounded.frag.glsl b/gsk/resources/vulkan/color-matrix-clip-rounded.frag.glsl
index 6015aee752..88057c7915 100644
--- a/gsk/resources/vulkan/color-matrix-clip-rounded.frag.glsl
+++ b/gsk/resources/vulkan/color-matrix-clip-rounded.frag.glsl
@@ -1,11 +1,7 @@
 #version 420 core
 
-#include "constants.glsl"
-
-struct RoundedRect {
-  vec4 bounds;
-  vec4 corners;
-};
+#define CLIP_ROUNDED_RECT
+#include "clip.frag.glsl"
 
 layout(location = 0) in vec2 inPos;
 layout(location = 1) in vec2 inTexCoord;
@@ -16,41 +12,6 @@ layout(set = 0, binding = 0) uniform sampler2D inTexture;
 
 layout(location = 0) out vec4 color;
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-float clip(vec2 pos, RoundedRect r) {
-  vec2 ref_tl = r.bounds.xy + vec2( r.corners.x,  r.corners.x);
-  vec2 ref_tr = r.bounds.zy + vec2(-r.corners.y,  r.corners.y);
-  vec2 ref_br = r.bounds.zw + vec2(-r.corners.z, -r.corners.z);
-  vec2 ref_bl = r.bounds.xw + vec2( r.corners.w, -r.corners.w);
-  
-  float d_tl = distance(pos, ref_tl);
-  float d_tr = distance(pos, ref_tr);
-  float d_br = distance(pos, ref_br);
-  float d_bl = distance(pos, ref_bl);
-
-  float pixels_per_fragment = length(fwidth(pos.xy));
-  float nudge = 0.5 * pixels_per_fragment;
-  vec4 distances = vec4(d_tl, d_tr, d_br, d_bl) - r.corners + nudge;
-
-  bvec4 is_out = bvec4(pos.x < ref_tl.x && pos.y < ref_tl.y,
-                       pos.x > ref_tr.x && pos.y < ref_tr.y,
-                       pos.x > ref_br.x && pos.y > ref_br.y,
-                       pos.x < ref_bl.x && pos.y > ref_bl.y);
-
-  float distance_from_border = dot(vec4(is_out),
-                                   max(vec4(0.0, 0.0, 0.0, 0.0), distances));
-
-  // Move the distance back into pixels.
-  distance_from_border /= pixels_per_fragment;
-  // Apply a more gradual fade out to transparent.
-  //distance_from_border -= 0.5;
-
-  return 1.0 - smoothstep(0.0, 1.0, distance_from_border);
-}
-
 vec4
 color_matrix (vec4 color, mat4 color_matrix, vec4 color_offset)
 {
@@ -70,7 +31,5 @@ color_matrix (vec4 color, mat4 color_matrix, vec4 color_offset)
 
 void main()
 {
-  RoundedRect r = RoundedRect(vec4(push.clip_bounds.xy, push.clip_bounds.xy + push.clip_bounds.zw), push.clip_widths);
-
-  color = color_matrix (texture (inTexture, inTexCoord), inColorMatrix, inColorOffset) * clip (inPos, r);
+  color = clip (inPos, color_matrix (texture (inTexture, inTexCoord), inColorMatrix, inColorOffset));
 }
diff --git a/gsk/resources/vulkan/color-matrix-clip-rounded.frag.spv b/gsk/resources/vulkan/color-matrix-clip-rounded.frag.spv
index f0a36e010c8729acc849f396b495e28ecfb283e4..2025e85572dbdf2eac118d497f3a56de4b3feea0 100644
GIT binary patch
literal 9676
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

literal 6872
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
GJNJJ&vz2xL

diff --git a/gsk/resources/vulkan/linear-clip-rounded.frag.glsl b/gsk/resources/vulkan/linear-clip-rounded.frag.glsl
index 4535a44abb..1fbf0955ac 100644
--- a/gsk/resources/vulkan/linear-clip-rounded.frag.glsl
+++ b/gsk/resources/vulkan/linear-clip-rounded.frag.glsl
@@ -1,17 +1,13 @@
 #version 420 core
 
-#include "constants.glsl"
+#define CLIP_ROUNDED_RECT
+#include "clip.frag.glsl"
 
 struct ColorStop {
   float offset;
   vec4 color;
 };
 
-struct RoundedRect {
-  vec4 bounds;
-  vec4 corners;
-};
-
 layout(location = 0) in vec2 inPos;
 layout(location = 1) in float inGradientPos;
 layout(location = 2) in flat int inRepeating;
@@ -20,45 +16,8 @@ layout(location = 4) in flat ColorStop inStops[8];
 
 layout(location = 0) out vec4 outColor;
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-float clip(vec2 pos, RoundedRect r) {
-  vec2 ref_tl = r.bounds.xy + vec2( r.corners.x,  r.corners.x);
-  vec2 ref_tr = r.bounds.zy + vec2(-r.corners.y,  r.corners.y);
-  vec2 ref_br = r.bounds.zw + vec2(-r.corners.z, -r.corners.z);
-  vec2 ref_bl = r.bounds.xw + vec2( r.corners.w, -r.corners.w);
-  
-  float d_tl = distance(pos, ref_tl);
-  float d_tr = distance(pos, ref_tr);
-  float d_br = distance(pos, ref_br);
-  float d_bl = distance(pos, ref_bl);
-
-  float pixels_per_fragment = length(fwidth(pos.xy));
-  float nudge = 0.5 * pixels_per_fragment;
-  vec4 distances = vec4(d_tl, d_tr, d_br, d_bl) - r.corners + nudge;
-
-  bvec4 is_out = bvec4(pos.x < ref_tl.x && pos.y < ref_tl.y,
-                       pos.x > ref_tr.x && pos.y < ref_tr.y,
-                       pos.x > ref_br.x && pos.y > ref_br.y,
-                       pos.x < ref_bl.x && pos.y > ref_bl.y);
-
-  float distance_from_border = dot(vec4(is_out),
-                                   max(vec4(0.0, 0.0, 0.0, 0.0), distances));
-
-  // Move the distance back into pixels.
-  distance_from_border /= pixels_per_fragment;
-  // Apply a more gradual fade out to transparent.
-  //distance_from_border -= 0.5;
-
-  return 1.0 - smoothstep(0.0, 1.0, distance_from_border);
-}
-
 void main()
 {
-  RoundedRect r = RoundedRect(vec4(push.clip_bounds.xy, push.clip_bounds.xy + push.clip_bounds.zw), push.clip_widths);
-
   float pos;
   if (inRepeating != 0)
     pos = fract (inGradientPos);
@@ -74,5 +33,5 @@ void main()
     }
   
   //outColor = vec4(pos, pos, pos, 1.0);
-  outColor = color * clip (inPos, r);
+  outColor = clip (inPos, color);
 }
diff --git a/gsk/resources/vulkan/linear-clip-rounded.frag.spv b/gsk/resources/vulkan/linear-clip-rounded.frag.spv
index 4a018c04149ffaf4b07f31d89481294b26345bef..2610f33ea467c10469b7f863bd742cf7437d7d59 100644
GIT binary patch
literal 9836
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

literal 7032
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