GNOME.org
 

[mutter/gbsneto/graphene-matrix: 44/44] Remove CoglMatrix


commit ba64c1a9c160450de8150713c519280193ac9a30
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Fri Sep 11 20:01:54 2020 -0300

    Remove CoglMatrix
    
    Adios, amiga.
    
    https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1439

 cogl/cogl/cogl-clip-stack.c                 |   1 -
 cogl/cogl/cogl-clip-stack.h                 |   1 -
 cogl/cogl/cogl-framebuffer.c                |   7 -
 cogl/cogl/cogl-matrix-private.h             |  58 ----
 cogl/cogl/cogl-matrix-stack.c               |   1 -
 cogl/cogl/cogl-matrix-stack.h               |   1 -
 cogl/cogl/cogl-matrix.c                     | 370 ---------------------
 cogl/cogl/cogl-matrix.h                     | 491 ----------------------------
 cogl/cogl/cogl-meta-texture.c               |   1 -
 cogl/cogl/cogl-pipeline-layer-private.h     |   1 -
 cogl/cogl/cogl-pipeline-layer-state.c       |   1 -
 cogl/cogl/cogl-pipeline-layer-state.h       |   1 -
 cogl/cogl/cogl-pipeline-private.h           |   1 -
 cogl/cogl/cogl.c                            |   1 -
 cogl/cogl/cogl.h                            |   1 -
 cogl/cogl/deprecated/cogl-material-compat.c |   1 -
 cogl/cogl/deprecated/cogl-material-compat.h |   1 -
 cogl/cogl/meson.build                       |   3 -
 18 files changed, 942 deletions(-)
---
diff --git a/cogl/cogl/cogl-clip-stack.c b/cogl/cogl/cogl-clip-stack.c
index e39f5b9096..e158187213 100644
--- a/cogl/cogl/cogl-clip-stack.c
+++ b/cogl/cogl/cogl-clip-stack.c
@@ -40,7 +40,6 @@
 #include "cogl-framebuffer-private.h"
 #include "cogl-journal-private.h"
 #include "cogl-util.h"
-#include "cogl-matrix-private.h"
 #include "cogl-primitives-private.h"
 #include "cogl-private.h"
 #include "cogl-attribute-private.h"
diff --git a/cogl/cogl/cogl-clip-stack.h b/cogl/cogl/cogl-clip-stack.h
index 62d65bcd39..2efaa27774 100644
--- a/cogl/cogl/cogl-clip-stack.h
+++ b/cogl/cogl/cogl-clip-stack.h
@@ -31,7 +31,6 @@
 #ifndef __COGL_CLIP_STACK_H
 #define __COGL_CLIP_STACK_H
 
-#include "cogl-matrix.h"
 #include "cogl-primitive.h"
 #include "cogl-framebuffer.h"
 #include "cogl-matrix-stack.h"
diff --git a/cogl/cogl/cogl-framebuffer.c b/cogl/cogl/cogl-framebuffer.c
index 21fdf2e978..b4991900ba 100644
--- a/cogl/cogl/cogl-framebuffer.c
+++ b/cogl/cogl/cogl-framebuffer.c
@@ -45,7 +45,6 @@
 #include "cogl-clip-stack.h"
 #include "cogl-journal-private.h"
 #include "cogl-pipeline-state-private.h"
-#include "cogl-matrix-private.h"
 #include "cogl-primitive-private.h"
 #include "cogl-offscreen.h"
 #include "cogl1-context.h"
@@ -1600,7 +1599,6 @@ cogl_framebuffer_get_modelview_matrix (CoglFramebuffer   *framebuffer,
   CoglMatrixEntry *modelview_entry =
     _cogl_framebuffer_get_modelview_entry (framebuffer);
   cogl_matrix_entry_get (modelview_entry, matrix);
-  _COGL_MATRIX_DEBUG_PRINT (matrix);
 }
 
 void
@@ -1614,8 +1612,6 @@ cogl_framebuffer_set_modelview_matrix (CoglFramebuffer         *framebuffer,
   if (framebuffer->context->current_draw_buffer == framebuffer)
     framebuffer->context->current_draw_buffer_changes |=
       COGL_FRAMEBUFFER_STATE_MODELVIEW;
-
-  _COGL_MATRIX_DEBUG_PRINT (matrix);
 }
 
 void
@@ -1625,7 +1621,6 @@ cogl_framebuffer_get_projection_matrix (CoglFramebuffer   *framebuffer,
   CoglMatrixEntry *projection_entry =
     _cogl_framebuffer_get_projection_entry (framebuffer);
   cogl_matrix_entry_get (projection_entry, matrix);
-  _COGL_MATRIX_DEBUG_PRINT (matrix);
 }
 
 void
@@ -1644,8 +1639,6 @@ cogl_framebuffer_set_projection_matrix (CoglFramebuffer         *framebuffer,
   if (framebuffer->context->current_draw_buffer == framebuffer)
     framebuffer->context->current_draw_buffer_changes |=
       COGL_FRAMEBUFFER_STATE_PROJECTION;
-
-  _COGL_MATRIX_DEBUG_PRINT (matrix);
 }
 
 void
diff --git a/cogl/cogl/cogl-matrix-stack.c b/cogl/cogl/cogl-matrix-stack.c
index b978c51a0c..3f68830681 100644
--- a/cogl/cogl/cogl-matrix-stack.c
+++ b/cogl/cogl/cogl-matrix-stack.c
@@ -39,7 +39,6 @@
 #include "cogl-framebuffer-private.h"
 #include "cogl-object-private.h"
 #include "cogl-offscreen.h"
-#include "cogl-matrix-private.h"
 #include "cogl-magazine-private.h"
 #include "cogl-gtype-private.h"
 
diff --git a/cogl/cogl/cogl-matrix-stack.h b/cogl/cogl/cogl-matrix-stack.h
index 1b83a8e246..3e330916fb 100644
--- a/cogl/cogl/cogl-matrix-stack.h
+++ b/cogl/cogl/cogl-matrix-stack.h
@@ -39,7 +39,6 @@
 #error "Only <cogl/cogl.h> can be included directly."
 #endif
 
-#include "cogl-matrix.h"
 #include "cogl-context.h"
 
 #include <graphene.h>
diff --git a/cogl/cogl/cogl-meta-texture.c b/cogl/cogl/cogl-meta-texture.c
index 026d86cd79..b8b91aa4a7 100644
--- a/cogl/cogl/cogl-meta-texture.c
+++ b/cogl/cogl/cogl-meta-texture.c
@@ -33,7 +33,6 @@
 #include "cogl-config.h"
 
 #include "cogl-texture.h"
-#include "cogl-matrix.h"
 #include "cogl-spans.h"
 #include "cogl-meta-texture.h"
 #include "cogl-texture-private.h"
diff --git a/cogl/cogl/cogl-pipeline-layer-private.h b/cogl/cogl/cogl-pipeline-layer-private.h
index 6328d33741..461a45519c 100644
--- a/cogl/cogl/cogl-pipeline-layer-private.h
+++ b/cogl/cogl/cogl-pipeline-layer-private.h
@@ -38,7 +38,6 @@
 #include "cogl-pipeline.h"
 #include "cogl-node-private.h"
 #include "cogl-texture.h"
-#include "cogl-matrix.h"
 #include "cogl-pipeline-layer-state.h"
 #include "cogl-pipeline-snippet-private.h"
 #include "cogl-sampler-cache-private.h"
diff --git a/cogl/cogl/cogl-pipeline-layer-state.c b/cogl/cogl/cogl-pipeline-layer-state.c
index 0260f90db0..b2503148da 100644
--- a/cogl/cogl/cogl-pipeline-layer-state.c
+++ b/cogl/cogl/cogl-pipeline-layer-state.c
@@ -37,7 +37,6 @@
 #include "cogl-pipeline-private.h"
 #include "cogl-blend-string.h"
 #include "cogl-util.h"
-#include "cogl-matrix.h"
 #include "cogl-snippet-private.h"
 #include "cogl-texture-private.h"
 #include "cogl-pipeline-layer-state-private.h"
diff --git a/cogl/cogl/cogl-pipeline-layer-state.h b/cogl/cogl/cogl-pipeline-layer-state.h
index 9e33e8184f..13bc465789 100644
--- a/cogl/cogl/cogl-pipeline-layer-state.h
+++ b/cogl/cogl/cogl-pipeline-layer-state.h
@@ -37,7 +37,6 @@
 
 #include <cogl/cogl-pipeline.h>
 #include <cogl/cogl-color.h>
-#include <cogl/cogl-matrix.h>
 #include <cogl/cogl-texture.h>
 
 G_BEGIN_DECLS
diff --git a/cogl/cogl/cogl-pipeline-private.h b/cogl/cogl/cogl-pipeline-private.h
index dbe62f82e3..b62c928566 100644
--- a/cogl/cogl/cogl-pipeline-private.h
+++ b/cogl/cogl/cogl-pipeline-private.h
@@ -37,7 +37,6 @@
 #include "cogl-node-private.h"
 #include "cogl-pipeline-layer-private.h"
 #include "cogl-pipeline.h"
-#include "cogl-matrix.h"
 #include "cogl-object-private.h"
 #include "cogl-profile.h"
 #include "cogl-list.h"
diff --git a/cogl/cogl/cogl.c b/cogl/cogl/cogl.c
index d9f6d495e0..a9cd5ca215 100644
--- a/cogl/cogl/cogl.c
+++ b/cogl/cogl/cogl.c
@@ -41,7 +41,6 @@
 #include "cogl-context-private.h"
 #include "cogl-pipeline-private.h"
 #include "cogl-framebuffer-private.h"
-#include "cogl-matrix-private.h"
 #include "cogl-journal-private.h"
 #include "cogl-bitmap-private.h"
 #include "cogl-texture-private.h"
diff --git a/cogl/cogl/cogl.h b/cogl/cogl/cogl.h
index 142293dacf..4a63a368fd 100644
--- a/cogl/cogl/cogl.h
+++ b/cogl/cogl/cogl.h
@@ -62,7 +62,6 @@
 #include <cogl/cogl-bitmap.h>
 #include <cogl/cogl-color.h>
 #include <cogl/cogl-dma-buf-handle.h>
-#include <cogl/cogl-matrix.h>
 #include <cogl/cogl-matrix-stack.h>
 #include <cogl/cogl-offscreen.h>
 #include <cogl/cogl-pixel-format.h>
diff --git a/cogl/cogl/deprecated/cogl-material-compat.c b/cogl/cogl/deprecated/cogl-material-compat.c
index e3a3c60cc0..ac7923325b 100644
--- a/cogl/cogl/deprecated/cogl-material-compat.c
+++ b/cogl/cogl/deprecated/cogl-material-compat.c
@@ -34,7 +34,6 @@
 #include <cogl-pipeline.h>
 #include <cogl-pipeline-private.h>
 #include <cogl-types.h>
-#include <cogl-matrix.h>
 #include <cogl-context-private.h>
 #include <deprecated/cogl-material-compat.h>
 
diff --git a/cogl/cogl/deprecated/cogl-material-compat.h b/cogl/cogl/deprecated/cogl-material-compat.h
index 0648b5f666..04842f546e 100644
--- a/cogl/cogl/deprecated/cogl-material-compat.h
+++ b/cogl/cogl/deprecated/cogl-material-compat.h
@@ -36,7 +36,6 @@
 #define __COGL_MATERIAL_H__
 
 #include <cogl/cogl-types.h>
-#include <cogl/cogl-matrix.h>
 #include <cogl/cogl-depth-state.h>
 #include <cogl/cogl-macros.h>
 #include <cogl/cogl-object.h>
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index 360675d4ce..a7346d81c5 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -79,7 +79,6 @@ cogl_headers = [
   'cogl-context.h',
   'cogl-frame-info.h',
   'cogl-framebuffer.h',
-  'cogl-matrix.h',
   'cogl-object.h',
   'cogl-offscreen.h',
   'cogl-onscreen.h',
@@ -258,8 +257,6 @@ cogl_sources = [
   'cogl-attribute.c',
   'cogl-primitive-private.h',
   'cogl-primitive.c',
-  'cogl-matrix.c',
-  'cogl-matrix-private.h',
   'cogl-matrix-stack.c',
   'cogl-matrix-stack-private.h',
   'cogl-depth-state.c',
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]