brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Move CoglMatrixMode to cogl-matrix-stack.h

Browse Source 
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
This commit is contained in:
Emmanuele Bassi 2010-01-04 11:58:32 +00:00
parent eb90295041
commit 4adc2c2d83
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clutter/cogl/cogl/cogl-internal.h
View File

@ -27,13 +27,6 @@
#include "cogl.h" #include "cogl.h"
#include "cogl-matrix-stack.h" #include "cogl-matrix-stack.h"
typedef enum
{
COGL_MATRIX_MODELVIEW,
COGL_MATRIX_PROJECTION,
COGL_MATRIX_TEXTURE
} CoglMatrixMode;
typedef enum typedef enum
{ {
COGL_FRONT_WINDING_CLOCKWISE, COGL_FRONT_WINDING_CLOCKWISE,

9
clutter/cogl/cogl/cogl-matrix-stack.h
View File

@ -28,10 +28,15 @@
#define __COGL_MATRIX_STACK_H #define __COGL_MATRIX_STACK_H
#include "cogl-matrix.h" #include "cogl-matrix.h"
#include "cogl.h" /* needed for GLenum */
typedef struct _CoglMatrixStack CoglMatrixStack; typedef struct _CoglMatrixStack CoglMatrixStack;
typedef enum {
COGL_MATRIX_MODELVIEW,
COGL_MATRIX_PROJECTION,
COGL_MATRIX_TEXTURE
} CoglMatrixMode;
CoglMatrixStack* _cogl_matrix_stack_new (void); CoglMatrixStack* _cogl_matrix_stack_new (void);
void _cogl_matrix_stack_destroy (CoglMatrixStack *stack); void _cogl_matrix_stack_destroy (CoglMatrixStack *stack);
void _cogl_matrix_stack_push (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, void _cogl_matrix_stack_set (CoglMatrixStack *stack,
const CoglMatrix *matrix); const CoglMatrix *matrix);
void _cogl_matrix_stack_flush_to_gl (CoglMatrixStack *stack, void _cogl_matrix_stack_flush_to_gl (CoglMatrixStack *stack,
GLenum gl_mode); CoglMatrixMode mode);
void _cogl_matrix_stack_dirty (CoglMatrixStack *stack); void _cogl_matrix_stack_dirty (CoglMatrixStack *stack);
#endif /* __COGL_MATRIX_STACK_H */ #endif /* __COGL_MATRIX_STACK_H */