From: Timm Bäder <mail@baedert.org>
Date: Tue, 17 Dec 2019 14:55:24 +0000 (+0100)
Subject: gl renderer: Compute final color in vertex shader
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~421
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=91472b2ecdb235eeab5e62a5999b54c710dc4c2d;p=gtk4.git

gl renderer: Compute final color in vertex shader

This is a very often used shader. No need to to do this for every
fragment.
---

diff --git a/gsk/resources/glsl/color.glsl b/gsk/resources/glsl/color.glsl
index dcd65100a3..c80f501ac0 100644
--- a/gsk/resources/glsl/color.glsl
+++ b/gsk/resources/glsl/color.glsl
@@ -1,16 +1,21 @@
 // VERTEX_SHADER:
+uniform vec4 u_color;
+
+_OUT_ vec4 final_color;
+
 void main() {
   gl_Position = u_projection * u_modelview * vec4(aPosition, 0.0, 1.0);
+
+  final_color = u_color;
+  // Pre-multiply alpha
+  final_color.rgb *= final_color.a;
+  final_color *= u_alpha;
 }
 
 // FRAGMENT_SHADER:
-uniform vec4 u_color;
+_IN_ vec4 final_color;
 
 void main() {
-  vec4 color = u_color;
-
-  // Pre-multiply alpha
-  color.rgb *= color.a;
-  setOutputColor(color * u_alpha);
+  setOutputColor(final_color);
 }
 
diff --git a/gsk/resources/glsl/preamble.vs.glsl b/gsk/resources/glsl/preamble.vs.glsl
index 6b18bb7ce2..887482fee7 100644
--- a/gsk/resources/glsl/preamble.vs.glsl
+++ b/gsk/resources/glsl/preamble.vs.glsl
@@ -1,5 +1,6 @@
 uniform mat4 u_projection;
 uniform mat4 u_modelview;
+uniform float u_alpha;
 
 #if GSK_GLES
 #define _OUT_ varying