gl renderer: Remove some unused uniforms

diff --git a/gsk/gl/gskglrenderopsprivate.h b/gsk/gl/gskglrenderopsprivate.h
index 75ae2ac5fd079112faa28bfb7a4b83e4a6b0acf6..d5a223450e57e24b1aa6df87965222c7fc8129b4 100644 (file)
--- a/gsk/gl/gskglrenderopsprivate.h
+++ b/gsk/gl/gskglrenderopsprivate.h
@@ -44,7 +44,6 @@ struct _Program
   int position_location;
   int uv_location;
   int alpha_location;
-  int blend_mode_location;
   int viewport_location;
   int projection_location;
   int modelview_location;

diff --git a/gsk/resources/glsl/es2_common.fs.glsl b/gsk/resources/glsl/es2_common.fs.glsl
index 0ed8df869283dcab33beccef25eda73471955be9..9ee61eb15e38bcf02e24a81406de6a6216912171 100644 (file)
--- a/gsk/resources/glsl/es2_common.fs.glsl
+++ b/gsk/resources/glsl/es2_common.fs.glsl
@@ -1,11 +1,9 @@
 precision mediump float;
 
 uniform sampler2D u_source;
-uniform sampler2D u_mask;
 uniform mat4 u_projection;
 uniform mat4 u_modelview;
 uniform float u_alpha;
-uniform int uBlendMode;
 uniform vec4 u_viewport;
 
 // In GtkSnapshot coordinates

diff --git a/gsk/resources/glsl/gl3_common.fs.glsl b/gsk/resources/glsl/gl3_common.fs.glsl
index a7117c5fe866fb058afa8eb0794ad480a06a21d4..ce853fdf2d0227982ce96c76f3dde2d696a07cd1 100644 (file)
--- a/gsk/resources/glsl/gl3_common.fs.glsl
+++ b/gsk/resources/glsl/gl3_common.fs.glsl
@@ -1,11 +1,9 @@
 precision highp float;
 
 uniform sampler2D u_source;
-uniform sampler2D u_mask;
 uniform mat4 u_projection = mat4(1.0);
 uniform mat4 u_modelview = mat4(1.0);
 uniform float u_alpha = 1.0;
-uniform int uBlendMode;
 uniform vec4 u_viewport;
 
 // In GtkSnapshot coordinates

diff --git a/gsk/resources/glsl/gl_common.fs.glsl b/gsk/resources/glsl/gl_common.fs.glsl
index cdac39a3532808c64f3d049d931983e448934d84..4df992c2df775ddd9279fb9337eab8bf29ea1666 100644 (file)
--- a/gsk/resources/glsl/gl_common.fs.glsl
+++ b/gsk/resources/glsl/gl_common.fs.glsl
@@ -1,9 +1,7 @@
 uniform sampler2D u_source;
-uniform sampler2D u_mask;
 uniform mat4 u_projection;
 uniform mat4 u_modelview;
 uniform float u_alpha;
-uniform int uBlendMode;
 uniform vec4 u_viewport;
 
 // In GtkSnapshot coordinates