[libadwaita] glsl: Make the code style match C
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libadwaita] glsl: Make the code style match C
- Date: Wed, 12 May 2021 11:43:54 +0000 (UTC)
commit a1e8587d623791d3c992a934c5feb46ba209432a
Author: Adrien Plazas <kekun plazas laposte net>
Date: Mon May 10 14:35:57 2021 +0200
glsl: Make the code style match C
src/glsl/fade.glsl | 10 ++++++----
src/glsl/mask.glsl | 13 +++++++------
2 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/src/glsl/fade.glsl b/src/glsl/fade.glsl
index c698eab8..3d99c221 100644
--- a/src/glsl/fade.glsl
+++ b/src/glsl/fade.glsl
@@ -7,10 +7,12 @@ uniform sampler2D u_texture1;
#define FADE_WIDTH 18
-void mainImage(out vec4 fragColor,
- in vec2 fragCoord,
- in vec2 resolution,
- in vec2 uv) {
+void
+mainImage (out vec4 fragColor,
+ in vec2 fragCoord,
+ in vec2 resolution,
+ in vec2 uv)
+{
float progress;
fragColor = GskTexture (u_texture1, uv);
diff --git a/src/glsl/mask.glsl b/src/glsl/mask.glsl
index ea01665f..3b56ce9c 100644
--- a/src/glsl/mask.glsl
+++ b/src/glsl/mask.glsl
@@ -1,13 +1,14 @@
uniform sampler2D u_texture1;
uniform sampler2D u_texture2;
-void mainImage(out vec4 fragColor,
- in vec2 fragCoord,
- in vec2 resolution,
- in vec2 uv)
+void
+mainImage (out vec4 fragColor,
+ in vec2 fragCoord,
+ in vec2 resolution,
+ in vec2 uv)
{
- vec4 source = GskTexture(u_texture1, uv);
- vec4 mask = GskTexture(u_texture2, uv);
+ vec4 source = GskTexture (u_texture1, uv);
+ vec4 mask = GskTexture (u_texture2, uv);
fragColor = source * (1 - mask.w);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]