[mutter] cogl: Remove fixed-function handling for layer color



commit 9f2662c7f8467a369520e4697f358066d0934cd6
Author: Adam Jackson <ajax redhat com>
Date:   Thu Dec 19 16:16:17 2019 -0500

    cogl: Remove fixed-function handling for layer color
    
    This can't matter anymore, glColor* doesn't get used when drawing
    through a shader.
    
    https://gitlab.gnome.org/GNOME/mutter/merge_requests/995

 cogl/cogl/driver/gl/cogl-pipeline-opengl.c | 17 -----------------
 1 file changed, 17 deletions(-)
---
diff --git a/cogl/cogl/driver/gl/cogl-pipeline-opengl.c b/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
index b73e6b205..2309a11a2 100644
--- a/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
+++ b/cogl/cogl/driver/gl/cogl-pipeline-opengl.c
@@ -359,23 +359,6 @@ _cogl_pipeline_flush_color_blend_alpha_depth_state (
 {
   _COGL_GET_CONTEXT (ctx, NO_RETVAL);
 
-  /* On GLES2 we'll flush the color later */
-  if (ctx->driver == COGL_DRIVER_GL && !with_color_attrib)
-    {
-      if ((pipelines_difference & COGL_PIPELINE_STATE_COLOR) ||
-          /* Assume if we were previously told to skip the color, then
-           * the current color needs updating... */
-          ctx->current_pipeline_with_color_attrib)
-        {
-          CoglPipeline *authority =
-            _cogl_pipeline_get_authority (pipeline, COGL_PIPELINE_STATE_COLOR);
-          GE (ctx, glColor4ub (cogl_color_get_red_byte (&authority->color),
-                               cogl_color_get_green_byte (&authority->color),
-                               cogl_color_get_blue_byte (&authority->color),
-                               cogl_color_get_alpha_byte (&authority->color)));
-        }
-    }
-
   if (pipelines_difference & COGL_PIPELINE_STATE_BLEND)
     {
       CoglPipeline *authority =


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