mirror of
https://github.com/brl/mutter.git
synced 2024-12-23 19:42:05 +00:00
Merge branch 'matrix-mode'
* matrix-mode: build: Move CoglMatrixMode to cogl-matrix-stack.h
This commit is contained in:
commit
493bdb48fd
@ -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,
|
||||
|
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user