From 737763112e2d9eec446815bac434172e3dba880b Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 18 Dec 2019 16:54:27 -0500 Subject: [PATCH] cogl: Remove unused CoglMatrixMode https://gitlab.gnome.org/GNOME/mutter/merge_requests/995 --- cogl/cogl/cogl-context-private.h | 4 ---- cogl/cogl/cogl-context.c | 2 -- cogl/cogl/cogl-matrix-stack-private.h | 7 ------- 3 files changed, 13 deletions(-) diff --git a/cogl/cogl/cogl-context-private.h b/cogl/cogl/cogl-context-private.h index 3cd639aae..a6efc4e3a 100644 --- a/cogl/cogl/cogl-context-private.h +++ b/cogl/cogl/cogl-context-private.h @@ -122,10 +122,6 @@ struct _CoglContext CoglMatrix identity_matrix; CoglMatrix y_flip_matrix; - /* Value that was last used when calling glMatrixMode to avoid - calling it multiple times */ - CoglMatrixMode flushed_matrix_mode; - /* The matrix stack entries that should be flushed during the next * pipeline state flush */ CoglMatrixEntry *current_projection_entry; diff --git a/cogl/cogl/cogl-context.c b/cogl/cogl/cogl-context.c index cb28321f6..aace02005 100644 --- a/cogl/cogl/cogl-context.c +++ b/cogl/cogl/cogl-context.c @@ -252,8 +252,6 @@ cogl_context_new (CoglDisplay *display, cogl_matrix_init_identity (&context->y_flip_matrix); cogl_matrix_scale (&context->y_flip_matrix, 1, -1, 1); - context->flushed_matrix_mode = COGL_MATRIX_MODELVIEW; - context->opaque_color_pipeline = cogl_pipeline_new (context); context->codegen_header_buffer = g_string_new (""); diff --git a/cogl/cogl/cogl-matrix-stack-private.h b/cogl/cogl/cogl-matrix-stack-private.h index 264394ebe..7a6e8b587 100644 --- a/cogl/cogl/cogl-matrix-stack-private.h +++ b/cogl/cogl/cogl-matrix-stack-private.h @@ -154,13 +154,6 @@ typedef struct _CoglMatrixEntryCache void _cogl_matrix_entry_identity_init (CoglMatrixEntry *entry); -typedef enum -{ - COGL_MATRIX_MODELVIEW, - COGL_MATRIX_PROJECTION, - COGL_MATRIX_TEXTURE -} CoglMatrixMode; - void _cogl_matrix_entry_cache_init (CoglMatrixEntryCache *cache);