From 25c7d15040793bb6baeff4443cd9a2f94a47dc2b Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Wed, 27 Feb 2019 18:35:57 -0300 Subject: [PATCH] cogl/matrix: Remove cogl_matrix_ortho It's deprecated and unused, and will only complicate transitioning to Graphene even further. --- cogl/cogl/cogl-matrix.c | 13 ------------- cogl/cogl/cogl-matrix.h | 28 ---------------------------- cogl/cogl/cogl.symbols | 3 --- 3 files changed, 44 deletions(-) diff --git a/cogl/cogl/cogl-matrix.c b/cogl/cogl/cogl-matrix.c index 2c568c755..e1626f2c0 100644 --- a/cogl/cogl/cogl-matrix.c +++ b/cogl/cogl/cogl-matrix.c @@ -529,19 +529,6 @@ _cogl_matrix_orthographic (CoglMatrix *matrix, matrix_multiply_array_with_flags (matrix, m); } -void -cogl_matrix_ortho (CoglMatrix *matrix, - float left, - float right, - float bottom, - float top, - float near, - float far) -{ - _cogl_matrix_orthographic (matrix, left, top, right, bottom, near, far); - _COGL_MATRIX_DEBUG_PRINT (matrix); -} - void cogl_matrix_orthographic (CoglMatrix *matrix, float x_1, diff --git a/cogl/cogl/cogl-matrix.h b/cogl/cogl/cogl-matrix.h index 0da213e05..e449e816e 100644 --- a/cogl/cogl/cogl-matrix.h +++ b/cogl/cogl/cogl-matrix.h @@ -379,34 +379,6 @@ cogl_matrix_orthographic (CoglMatrix *matrix, float near, float far); -/** - * cogl_matrix_ortho: - * @matrix: A 4x4 transformation matrix - * @left: The coordinate for the left clipping plane - * @right: The coordinate for the right clipping plane - * @bottom: The coordinate for the bottom clipping plane - * @top: The coordinate for the top clipping plane - * @near: The distance to the near clipping - * plane (will be negative if the plane is - * behind the viewer) - * @far: The distance to the far clipping - * plane (will be negative if the plane is - * behind the viewer) - * - * Multiplies @matrix by a parallel projection matrix. - * - * Deprecated: 1.10: Use cogl_matrix_orthographic() - */ -COGL_DEPRECATED_FOR (cogl_matrix_orthographic) -void -cogl_matrix_ortho (CoglMatrix *matrix, - float left, - float right, - float bottom, - float top, - float near, - float far); - /** * cogl_matrix_view_2d_in_frustum: * @matrix: A 4x4 transformation matrix diff --git a/cogl/cogl/cogl.symbols b/cogl/cogl/cogl.symbols index 4eb08e301..7a588b05e 100644 --- a/cogl/cogl/cogl.symbols +++ b/cogl/cogl/cogl.symbols @@ -486,9 +486,6 @@ cogl_matrix_init_from_quaternion cogl_matrix_init_identity cogl_matrix_look_at cogl_matrix_multiply -#ifndef COGL_DISABLE_DEPRECATED -cogl_matrix_ortho -#endif cogl_matrix_orthographic cogl_matrix_perspective cogl_matrix_project_points