[gtk/wip/baedert/gl-rework: 1/16] gl renderer: Remove some unused uniforms



commit 4fc8e60b2debb12221f61a3d1924145db7367582
Author: Timm Bäder <tbaeder redhat com>
Date:   Wed Dec 11 08:38:57 2019 +0100

    gl renderer: Remove some unused uniforms

 gsk/gl/gskglrenderopsprivate.h        | 1 -
 gsk/resources/glsl/es2_common.fs.glsl | 2 --
 gsk/resources/glsl/gl3_common.fs.glsl | 2 --
 gsk/resources/glsl/gl_common.fs.glsl  | 2 --
 4 files changed, 7 deletions(-)
---
diff --git a/gsk/gl/gskglrenderopsprivate.h b/gsk/gl/gskglrenderopsprivate.h
index 75ae2ac5fd..d5a223450e 100644
--- 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 0ed8df8692..9ee61eb15e 100644
--- 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 a7117c5fe8..ce853fdf2d 100644
--- 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 cdac39a353..4df992c2df 100644
--- 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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]