sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

cogl/gl-framebuffer: GObject:ify helper functions

Browse source 
The object was still pretending to be CoglFramebuffer itself, by using
naming and calling conventions making it seem like that. Fix that by
passing around the driver instead of the framebuffer.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1514>
This commit is contained in:
Jonas Ådahl 2020-10-20 11:24:43 +02:00 committed by Robert Mader
parent 0fcb26075f
commit dd55c3699c
1 changed files with 38 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
cogl/cogl/driver/gl/cogl-framebuffer-gl.c
View file

@ -57,8 +57,11 @@ context_from_driver (CoglFramebufferDriver *driver)
} }
static void static void
_cogl_framebuffer_gl_flush_viewport_state (CoglFramebuffer *framebuffer) cogl_gl_framebuffer_flush_viewport_state (CoglGlFramebuffer *gl_framebuffer)
{ {
CoglFramebufferDriver *driver = COGL_FRAMEBUFFER_DRIVER (gl_framebuffer);
CoglFramebuffer *framebuffer =
cogl_framebuffer_driver_get_framebuffer (driver);
float viewport_x, viewport_y, viewport_width, viewport_height; float viewport_x, viewport_y, viewport_width, viewport_height;
float gl_viewport_y; float gl_viewport_y;
@ -97,19 +100,26 @@ _cogl_framebuffer_gl_flush_viewport_state (CoglFramebuffer *framebuffer)
} }
static void static void
_cogl_framebuffer_gl_flush_clip_state (CoglFramebuffer *framebuffer) cogl_gl_framebuffer_flush_clip_state (CoglGlFramebuffer *gl_framebuffer)
{ {
CoglFramebufferDriver *driver = COGL_FRAMEBUFFER_DRIVER (gl_framebuffer);
CoglFramebuffer *framebuffer =
cogl_framebuffer_driver_get_framebuffer (driver);
_cogl_clip_stack_flush (_cogl_framebuffer_get_clip_stack (framebuffer), _cogl_clip_stack_flush (_cogl_framebuffer_get_clip_stack (framebuffer),
framebuffer); framebuffer);
} }
static void static void
_cogl_framebuffer_gl_flush_dither_state (CoglFramebuffer *framebuffer) cogl_gl_framebuffer_flush_dither_state (CoglGlFramebuffer *gl_framebuffer)
{ {
CoglFramebufferDriver *driver = COGL_FRAMEBUFFER_DRIVER (gl_framebuffer);
CoglFramebuffer *framebuffer =
cogl_framebuffer_driver_get_framebuffer (driver);
CoglContext *ctx = cogl_framebuffer_get_context (framebuffer); CoglContext *ctx = cogl_framebuffer_get_context (framebuffer);
gboolean is_dither_enabled = gboolean is_dither_enabled;
cogl_framebuffer_get_dither_enabled (framebuffer);
is_dither_enabled = cogl_framebuffer_get_dither_enabled (framebuffer);
if (ctx->current_gl_dither_enabled != is_dither_enabled) if (ctx->current_gl_dither_enabled != is_dither_enabled)
{ {
if (is_dither_enabled) if (is_dither_enabled)
@ -121,8 +131,11 @@ _cogl_framebuffer_gl_flush_dither_state (CoglFramebuffer *framebuffer)
} }
static void static void
_cogl_framebuffer_gl_flush_modelview_state (CoglFramebuffer *framebuffer) cogl_gl_framebuffer_flush_modelview_state (CoglGlFramebuffer *gl_framebuffer)
{ {
CoglFramebufferDriver *driver = COGL_FRAMEBUFFER_DRIVER (gl_framebuffer);
CoglFramebuffer *framebuffer =
cogl_framebuffer_driver_get_framebuffer (driver);
CoglContext *ctx = cogl_framebuffer_get_context (framebuffer); CoglContext *ctx = cogl_framebuffer_get_context (framebuffer);
CoglMatrixEntry *modelview_entry = CoglMatrixEntry *modelview_entry =
_cogl_framebuffer_get_modelview_entry (framebuffer); _cogl_framebuffer_get_modelview_entry (framebuffer);
@ -131,8 +144,11 @@ _cogl_framebuffer_gl_flush_modelview_state (CoglFramebuffer *framebuffer)
} }
static void static void
_cogl_framebuffer_gl_flush_projection_state (CoglFramebuffer *framebuffer) cogl_gl_framebuffer_flush_projection_state (CoglGlFramebuffer *gl_framebuffer)
{ {
CoglFramebufferDriver *driver = COGL_FRAMEBUFFER_DRIVER (gl_framebuffer);
CoglFramebuffer *framebuffer =
cogl_framebuffer_driver_get_framebuffer (driver);
CoglContext *ctx = cogl_framebuffer_get_context (framebuffer); CoglContext *ctx = cogl_framebuffer_get_context (framebuffer);
CoglMatrixEntry *projection_entry = CoglMatrixEntry *projection_entry =
_cogl_framebuffer_get_projection_entry (framebuffer); _cogl_framebuffer_get_projection_entry (framebuffer);
@ -141,8 +157,11 @@ _cogl_framebuffer_gl_flush_projection_state (CoglFramebuffer *framebuffer)
} }
static void static void
_cogl_framebuffer_gl_flush_front_face_winding_state (CoglFramebuffer *framebuffer) cogl_gl_framebuffer_flush_front_face_winding_state (CoglGlFramebuffer *gl_framebuffer)
{ {
CoglFramebufferDriver *driver = COGL_FRAMEBUFFER_DRIVER (gl_framebuffer);
CoglFramebuffer *framebuffer =
cogl_framebuffer_driver_get_framebuffer (driver);
CoglContext *context = cogl_framebuffer_get_context (framebuffer); CoglContext *context = cogl_framebuffer_get_context (framebuffer);
CoglPipelineCullFaceMode mode; CoglPipelineCullFaceMode mode;
@ -173,8 +192,11 @@ _cogl_framebuffer_gl_flush_front_face_winding_state (CoglFramebuffer *framebuffe
} }
static void static void
_cogl_framebuffer_gl_flush_stereo_mode_state (CoglFramebuffer *framebuffer) cogl_gl_framebuffer_flush_stereo_mode_state (CoglGlFramebuffer *gl_framebuffer)
{ {
CoglFramebufferDriver *driver = COGL_FRAMEBUFFER_DRIVER (gl_framebuffer);
CoglFramebuffer *framebuffer =
cogl_framebuffer_driver_get_framebuffer (driver);
CoglContext *ctx = cogl_framebuffer_get_context (framebuffer); CoglContext *ctx = cogl_framebuffer_get_context (framebuffer);
GLenum draw_buffer = GL_BACK; GLenum draw_buffer = GL_BACK;
@ -212,9 +234,6 @@ void
cogl_gl_framebuffer_flush_state_differences (CoglGlFramebuffer *gl_framebuffer, cogl_gl_framebuffer_flush_state_differences (CoglGlFramebuffer *gl_framebuffer,
unsigned long differences) unsigned long differences)
{ {
CoglFramebufferDriver *driver = COGL_FRAMEBUFFER_DRIVER (gl_framebuffer);
CoglFramebuffer *framebuffer =
cogl_framebuffer_driver_get_framebuffer (driver);
int bit; int bit;
COGL_FLAGS_FOREACH_START (&differences, 1, bit) COGL_FLAGS_FOREACH_START (&differences, 1, bit)
@ -226,29 +245,29 @@ cogl_gl_framebuffer_flush_state_differences (CoglGlFramebuffer *gl_framebuffer,
switch (bit) switch (bit)
{ {
case COGL_FRAMEBUFFER_STATE_INDEX_VIEWPORT: case COGL_FRAMEBUFFER_STATE_INDEX_VIEWPORT:
_cogl_framebuffer_gl_flush_viewport_state (framebuffer); cogl_gl_framebuffer_flush_viewport_state (gl_framebuffer);
break; break;
case COGL_FRAMEBUFFER_STATE_INDEX_CLIP: case COGL_FRAMEBUFFER_STATE_INDEX_CLIP:
_cogl_framebuffer_gl_flush_clip_state (framebuffer); cogl_gl_framebuffer_flush_clip_state (gl_framebuffer);
break; break;
case COGL_FRAMEBUFFER_STATE_INDEX_DITHER: case COGL_FRAMEBUFFER_STATE_INDEX_DITHER:
_cogl_framebuffer_gl_flush_dither_state (framebuffer); cogl_gl_framebuffer_flush_dither_state (gl_framebuffer);
break; break;
case COGL_FRAMEBUFFER_STATE_INDEX_MODELVIEW: case COGL_FRAMEBUFFER_STATE_INDEX_MODELVIEW:
_cogl_framebuffer_gl_flush_modelview_state (framebuffer); cogl_gl_framebuffer_flush_modelview_state (gl_framebuffer);
break; break;
case COGL_FRAMEBUFFER_STATE_INDEX_PROJECTION: case COGL_FRAMEBUFFER_STATE_INDEX_PROJECTION:
_cogl_framebuffer_gl_flush_projection_state (framebuffer); cogl_gl_framebuffer_flush_projection_state (gl_framebuffer);
break; break;
case COGL_FRAMEBUFFER_STATE_INDEX_FRONT_FACE_WINDING: case COGL_FRAMEBUFFER_STATE_INDEX_FRONT_FACE_WINDING:
_cogl_framebuffer_gl_flush_front_face_winding_state (framebuffer); cogl_gl_framebuffer_flush_front_face_winding_state (gl_framebuffer);
break; break;
case COGL_FRAMEBUFFER_STATE_INDEX_DEPTH_WRITE: case COGL_FRAMEBUFFER_STATE_INDEX_DEPTH_WRITE:
/* Nothing to do for depth write state change; the state will always /* Nothing to do for depth write state change; the state will always
* be taken into account when flushing the pipeline's depth state. */ * be taken into account when flushing the pipeline's depth state. */
break; break;
case COGL_FRAMEBUFFER_STATE_INDEX_STEREO_MODE: case COGL_FRAMEBUFFER_STATE_INDEX_STEREO_MODE:
_cogl_framebuffer_gl_flush_stereo_mode_state (framebuffer); cogl_gl_framebuffer_flush_stereo_mode_state (gl_framebuffer);
break; break;
default: default:
g_warn_if_reached (); g_warn_if_reached ();