From 4adc2c2d839c42eccc7187735ddcce061d25f14b Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 4 Jan 2010 11:58:32 +0000 Subject: [PATCH] build: Move CoglMatrixMode to cogl-matrix-stack.h This avoids a redeclaration of _cogl_matrix_stack_flush_to_gl() from using GLenum to CoglMatrixMode. http://bugzilla.openedhand.com/show_bug.cgi?id=1928 --- clutter/cogl/cogl/cogl-internal.h | 7 ------- clutter/cogl/cogl/cogl-matrix-stack.h | 9 +++++++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/clutter/cogl/cogl/cogl-internal.h b/clutter/cogl/cogl/cogl-internal.h index 714b75d19..585220a1d 100644 --- a/clutter/cogl/cogl/cogl-internal.h +++ b/clutter/cogl/cogl/cogl-internal.h @@ -27,13 +27,6 @@ #include "cogl.h" #include "cogl-matrix-stack.h" -typedef enum -{ - COGL_MATRIX_MODELVIEW, - COGL_MATRIX_PROJECTION, - COGL_MATRIX_TEXTURE -} CoglMatrixMode; - typedef enum { COGL_FRONT_WINDING_CLOCKWISE, diff --git a/clutter/cogl/cogl/cogl-matrix-stack.h b/clutter/cogl/cogl/cogl-matrix-stack.h index 648eace84..892e98cb0 100644 --- a/clutter/cogl/cogl/cogl-matrix-stack.h +++ b/clutter/cogl/cogl/cogl-matrix-stack.h @@ -28,10 +28,15 @@ #define __COGL_MATRIX_STACK_H #include "cogl-matrix.h" -#include "cogl.h" /* needed for GLenum */ typedef struct _CoglMatrixStack CoglMatrixStack; +typedef enum { + COGL_MATRIX_MODELVIEW, + COGL_MATRIX_PROJECTION, + COGL_MATRIX_TEXTURE +} CoglMatrixMode; + CoglMatrixStack* _cogl_matrix_stack_new (void); void _cogl_matrix_stack_destroy (CoglMatrixStack *stack); void _cogl_matrix_stack_push (CoglMatrixStack *stack); @@ -79,7 +84,7 @@ void _cogl_matrix_stack_get (CoglMatrixStack *stack, void _cogl_matrix_stack_set (CoglMatrixStack *stack, const CoglMatrix *matrix); void _cogl_matrix_stack_flush_to_gl (CoglMatrixStack *stack, - GLenum gl_mode); + CoglMatrixMode mode); void _cogl_matrix_stack_dirty (CoglMatrixStack *stack); #endif /* __COGL_MATRIX_STACK_H */