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

framebuffer: split GL code out from cogl-framebuffer.c

Browse Source 
This splits out most of the OpenGL specific code from cogl-framebuffer.c
into cogl-framebuffer-gl.c and extends the CoglDriverVtable interface
for cogl-framebuffer.c to use.

There are hopes to support several different backends for Cogl
eventually to hopefully get us closer to the metal so this makes some
progress in organizing which parts of Cogl are OpenGL specific so these
parts can potentially be switched out later.

The only remaining use of OpenGL still in cogl-framebuffer.c is to
handle cogl_framebuffer_read_pixels.
This commit is contained in:
Robert Bragg
2012-09-01 00:04:00 +01:00
parent 87bc616d34
commit ce5d06afe1
12 changed files with 1403 additions and 1061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
cogl/cogl-framebuffer-private.h
View File

@ -130,17 +130,9 @@ struct _CoglFramebuffer
CoglClipState clip_state;
CoglBool dirty_bitmasks;
int red_bits;
int blue_bits;
int green_bits;
int alpha_bits;
CoglBool dither_enabled;
CoglColorMask color_mask;
int samples_per_pixel;
/* We journal the textured rectangles we want to submit to OpenGL so
* we have an oppertunity to batch them together into less draw
* calls. */
@ -165,6 +157,15 @@ struct _CoglFramebuffer
int clear_clip_x1;
int clear_clip_y1;
CoglBool clear_clip_dirty;
/* driver specific */
CoglBool dirty_bitmasks;
int red_bits;
int blue_bits;
int green_bits;
int alpha_bits;
int samples_per_pixel;
};
typedef enum {
@ -429,7 +430,26 @@ _cogl_framebuffer_try_creating_gl_fbo (CoglContext *ctx,
CoglOffscreenAllocateFlags flags,
CoglGLFramebuffer *gl_framebuffer);
void
_cogl_gl_framebuffer_bind (CoglFramebuffer *framebuffer, GLenum target);
unsigned long
_cogl_framebuffer_compare (CoglFramebuffer *a,
CoglFramebuffer *b,
unsigned long state);
static inline CoglMatrixEntry *
_cogl_framebuffer_get_modelview_entry (CoglFramebuffer *framebuffer)
{
CoglMatrixStack *modelview_stack =
_cogl_framebuffer_get_modelview_stack (framebuffer);
return modelview_stack->last_entry;
}
static inline CoglMatrixEntry *
_cogl_framebuffer_get_projection_entry (CoglFramebuffer *framebuffer)
{
CoglMatrixStack *projection_stack =
_cogl_framebuffer_get_projection_stack (framebuffer);
return projection_stack->last_entry;
}
#endif /* __COGL_FRAMEBUFFER_PRIVATE_H */