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

cogl/framebuffer-gl: Rename from CoglFramebufferGl to CoglGlFramebuffer

Browse Source 
This is to follow the convention [ParentName][ChildName] representing
inheritance. As this does not inherit CoglFramebuffer, rename it
CoglGlFramebuffer.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1514>
This commit is contained in:
Jonas Ådahl 2020-10-18 19:53:11 +02:00 committed by Robert Mader
parent 0936d7bd06
commit 0e376f4dda
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
cogl/cogl/driver/gl/cogl-framebuffer-gl.c
View File

@ -127,11 +127,11 @@
#define GL_STENCIL 0x1802 #define GL_STENCIL 0x1802
#endif #endif
typedef struct _CoglFramebufferGl typedef struct _CoglGlFramebuffer
{ {
gboolean dirty_bitmasks; gboolean dirty_bitmasks;
CoglFramebufferBits bits; CoglFramebufferBits bits;
} CoglFramebufferGl; } CoglGlFramebuffer;
static void static void
_cogl_framebuffer_gl_flush_viewport_state (CoglFramebuffer *framebuffer) _cogl_framebuffer_gl_flush_viewport_state (CoglFramebuffer *framebuffer)
@ -949,33 +949,33 @@ _cogl_framebuffer_gl_clear (CoglFramebuffer *framebuffer,
GE (ctx, glClear (gl_buffers)); GE (ctx, glClear (gl_buffers));
} }
static CoglFramebufferGl * static CoglGlFramebuffer *
ensure_framebuffer_gl (CoglFramebuffer *framebuffer) ensure_gl_framebuffer (CoglFramebuffer *framebuffer)
{ {
CoglFramebufferGl *framebuffer_gl; CoglGlFramebuffer *gl_framebuffer;
framebuffer_gl = cogl_framebuffer_get_driver_private (framebuffer); gl_framebuffer = cogl_framebuffer_get_driver_private (framebuffer);
if (!framebuffer_gl) if (!gl_framebuffer)
{ {
framebuffer_gl = g_new0 (CoglFramebufferGl, 1); gl_framebuffer = g_new0 (CoglGlFramebuffer, 1);
cogl_framebuffer_set_driver_private (framebuffer, cogl_framebuffer_set_driver_private (framebuffer,
framebuffer_gl, gl_framebuffer,
g_free); g_free);
framebuffer_gl->dirty_bitmasks = TRUE; gl_framebuffer->dirty_bitmasks = TRUE;
} }
return framebuffer_gl; return gl_framebuffer;
} }
static inline void static inline void
_cogl_framebuffer_init_bits (CoglFramebuffer *framebuffer) _cogl_framebuffer_init_bits (CoglFramebuffer *framebuffer)
{ {
CoglContext *ctx = cogl_framebuffer_get_context (framebuffer); CoglContext *ctx = cogl_framebuffer_get_context (framebuffer);
CoglFramebufferGl *framebuffer_gl; CoglGlFramebuffer *gl_framebuffer;
framebuffer_gl = ensure_framebuffer_gl (framebuffer); gl_framebuffer = ensure_gl_framebuffer (framebuffer);
if (!framebuffer_gl->dirty_bitmasks) if (!gl_framebuffer->dirty_bitmasks)
return; return;
cogl_framebuffer_allocate (framebuffer, NULL); cogl_framebuffer_allocate (framebuffer, NULL);
@ -1019,7 +1019,7 @@ _cogl_framebuffer_init_bits (CoglFramebuffer *framebuffer)
for (i = 0; i < G_N_ELEMENTS (params); i++) for (i = 0; i < G_N_ELEMENTS (params); i++)
{ {
int *value = int *value =
(int *) ((uint8_t *) &framebuffer_gl->bits + params[i].offset); (int *) ((uint8_t *) &gl_framebuffer->bits + params[i].offset);
GE( ctx, glGetFramebufferAttachmentParameteriv (GL_FRAMEBUFFER, GE( ctx, glGetFramebufferAttachmentParameteriv (GL_FRAMEBUFFER,
params[i].attachment, params[i].attachment,
params[i].pname, params[i].pname,
@ -1029,12 +1029,12 @@ _cogl_framebuffer_init_bits (CoglFramebuffer *framebuffer)
else else
#endif /* HAVE_COGL_GL */ #endif /* HAVE_COGL_GL */
{ {
GE( ctx, glGetIntegerv (GL_RED_BITS, &framebuffer_gl->bits.red) ); GE( ctx, glGetIntegerv (GL_RED_BITS, &gl_framebuffer->bits.red) );
GE( ctx, glGetIntegerv (GL_GREEN_BITS, &framebuffer_gl->bits.green) ); GE( ctx, glGetIntegerv (GL_GREEN_BITS, &gl_framebuffer->bits.green) );
GE( ctx, glGetIntegerv (GL_BLUE_BITS, &framebuffer_gl->bits.blue) ); GE( ctx, glGetIntegerv (GL_BLUE_BITS, &gl_framebuffer->bits.blue) );
GE( ctx, glGetIntegerv (GL_ALPHA_BITS, &framebuffer_gl->bits.alpha) ); GE( ctx, glGetIntegerv (GL_ALPHA_BITS, &gl_framebuffer->bits.alpha) );
GE( ctx, glGetIntegerv (GL_DEPTH_BITS, &framebuffer_gl->bits.depth) ); GE( ctx, glGetIntegerv (GL_DEPTH_BITS, &gl_framebuffer->bits.depth) );
GE( ctx, glGetIntegerv (GL_STENCIL_BITS, &framebuffer_gl->bits.stencil) ); GE( ctx, glGetIntegerv (GL_STENCIL_BITS, &gl_framebuffer->bits.stencil) );
} }
/* If we don't have alpha textures then the alpha bits are actually /* If we don't have alpha textures then the alpha bits are actually
@ -1043,36 +1043,36 @@ _cogl_framebuffer_init_bits (CoglFramebuffer *framebuffer)
COGL_IS_OFFSCREEN (framebuffer) && COGL_IS_OFFSCREEN (framebuffer) &&
cogl_framebuffer_get_internal_format (framebuffer) == COGL_PIXEL_FORMAT_A_8) cogl_framebuffer_get_internal_format (framebuffer) == COGL_PIXEL_FORMAT_A_8)
{ {
framebuffer_gl->bits.alpha = framebuffer_gl->bits.red; gl_framebuffer->bits.alpha = gl_framebuffer->bits.red;
framebuffer_gl->bits.red = 0; gl_framebuffer->bits.red = 0;
} }
COGL_NOTE (OFFSCREEN, COGL_NOTE (OFFSCREEN,
"RGBA/D/S Bits for framebuffer[%p, %s]: %d, %d, %d, %d, %d, %d", "RGBA/D/S Bits for framebuffer[%p, %s]: %d, %d, %d, %d, %d, %d",
framebuffer, framebuffer,
COGL_IS_OFFSCREEN (framebuffer) ? "offscreen" : "onscreen", COGL_IS_OFFSCREEN (framebuffer) ? "offscreen" : "onscreen",
framebuffer_gl->bits.red, gl_framebuffer->bits.red,
framebuffer_gl->bits.blue, gl_framebuffer->bits.blue,
framebuffer_gl->bits.green, gl_framebuffer->bits.green,
framebuffer_gl->bits.alpha, gl_framebuffer->bits.alpha,
framebuffer_gl->bits.depth, gl_framebuffer->bits.depth,
framebuffer_gl->bits.stencil); gl_framebuffer->bits.stencil);
framebuffer_gl->dirty_bitmasks = FALSE; gl_framebuffer->dirty_bitmasks = FALSE;
} }
void void
_cogl_framebuffer_gl_query_bits (CoglFramebuffer *framebuffer, _cogl_framebuffer_gl_query_bits (CoglFramebuffer *framebuffer,
CoglFramebufferBits *bits) CoglFramebufferBits *bits)
{ {
CoglFramebufferGl *framebuffer_gl; CoglGlFramebuffer *gl_framebuffer;
_cogl_framebuffer_init_bits (framebuffer); _cogl_framebuffer_init_bits (framebuffer);
/* TODO: cache these in some driver specific location not /* TODO: cache these in some driver specific location not
* directly as part of CoglFramebuffer. */ * directly as part of CoglFramebuffer. */
framebuffer_gl = ensure_framebuffer_gl (framebuffer); gl_framebuffer = ensure_gl_framebuffer (framebuffer);
*bits = framebuffer_gl->bits; *bits = gl_framebuffer->bits;
} }
void void