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

cogl: Move blit_framebuffer to it correct namespace

Browse Source 
As it belongs into CoglFramebuffer.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4127>
This commit is contained in:
Bilal Elmoussaoui
2024-11-10 14:48:19 +01:00
committed by Marge Bot
parent 744894fa46
commit 45296416df
10 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
clutter/clutter/clutter-paint-nodes.c
View File

@ -1400,7 +1400,7 @@ clutter_blit_node_draw (ClutterPaintNode *node,
op_width = op->op.texrect[6] - op->op.texrect[4]; op_width = op->op.texrect[6] - op->op.texrect[4];
op_height = op->op.texrect[7] - op->op.texrect[5]; op_height = op->op.texrect[7] - op->op.texrect[5];
cogl_blit_framebuffer (blit_node->src, cogl_framebuffer_blit (blit_node->src,
framebuffer, framebuffer,
(int) op->op.texrect[0], (int) op->op.texrect[0],
(int) op->op.texrect[1], (int) op->op.texrect[1],
@ -1487,7 +1487,7 @@ clutter_blit_node_new (CoglFramebuffer *src)
* @height: Height of region to copy * @height: Height of region to copy
* *
* Adds a new blit rectangle to the stack of rectangles. All the * Adds a new blit rectangle to the stack of rectangles. All the
* constraints of [func@Cogl.blit_framebuffer] apply here. * constraints of [method@Cogl.Framebuffer.blit] apply here.
*/ */
void void
clutter_blit_node_add_blit_rectangle (ClutterBlitNode *blit_node, clutter_blit_node_add_blit_rectangle (ClutterBlitNode *blit_node,

2
clutter/clutter/clutter-stage-view.c
View File

@ -599,7 +599,7 @@ copy_shadowfb_to_onscreen (ClutterStageView *view,
rect = mtk_region_get_rectangle (damage_region, i); rect = mtk_region_get_rectangle (damage_region, i);
if (!cogl_blit_framebuffer (shadowfb, if (!cogl_framebuffer_blit (shadowfb,
priv->framebuffer, priv->framebuffer,
rect.x, rect.y, rect.x, rect.y,
rect.x, rect.y, rect.x, rect.y,

2
cogl/cogl/cogl-blit.c
View File

@ -205,7 +205,7 @@ _cogl_blit_framebuffer_blit (CoglBlitData *data,
int width, int width,
int height) int height)
{ {
cogl_blit_framebuffer (data->src_fb, cogl_framebuffer_blit (data->src_fb,
data->dest_fb, data->dest_fb,
src_x, src_y, src_x, src_y,
dst_x, dst_y, dst_x, dst_y,

2
cogl/cogl/cogl-context.h
View File

@ -172,7 +172,7 @@ cogl_context_get_renderer (CoglContext *context);
* buffers are tracked and so cogl_onscreen_get_buffer_age() can be * buffers are tracked and so cogl_onscreen_get_buffer_age() can be
* expected to return age values other than 0. * expected to return age values other than 0.
* @COGL_FEATURE_ID_BLIT_FRAMEBUFFER: Whether blitting using * @COGL_FEATURE_ID_BLIT_FRAMEBUFFER: Whether blitting using
* cogl_blit_framebuffer() is supported. * [method@Cogl.Framebuffer.blit] is supported.
* @COGL_FEATURE_ID_SYNC_FD * @COGL_FEATURE_ID_SYNC_FD
* cogl_context_get_latest_sync_fd() is supported. * cogl_context_get_latest_sync_fd() is supported.
* *

4
cogl/cogl/cogl-framebuffer.c
View File

@ -1376,7 +1376,7 @@ cogl_framebuffer_is_y_flipped (CoglFramebuffer *framebuffer)
} }
gboolean gboolean
cogl_blit_framebuffer (CoglFramebuffer *framebuffer, cogl_framebuffer_blit (CoglFramebuffer *framebuffer,
CoglFramebuffer *dst, CoglFramebuffer *dst,
int src_x, int src_x,
int src_y, int src_y,
@ -1409,7 +1409,7 @@ cogl_blit_framebuffer (CoglFramebuffer *framebuffer,
{ {
g_set_error_literal (error, COGL_SYSTEM_ERROR, g_set_error_literal (error, COGL_SYSTEM_ERROR,
COGL_SYSTEM_ERROR_UNSUPPORTED, COGL_SYSTEM_ERROR_UNSUPPORTED,
"cogl_blit_framebuffer premult mismatch."); "cogl_framebuffer_blit premult mismatch.");
return FALSE; return FALSE;
} }

4
cogl/cogl/cogl-framebuffer.h
View File

@ -1034,7 +1034,7 @@ typedef enum /*< prefix=COGL_FRAMEBUFFER_ERROR >*/
} CoglFramebufferError; } CoglFramebufferError;
/** /**
* cogl_blit_framebuffer: * cogl_framebuffer_blit:
* @framebuffer: The source #CoglFramebuffer * @framebuffer: The source #CoglFramebuffer
* @dst: The destination #CoglFramebuffer * @dst: The destination #CoglFramebuffer
* @src_x: Source x position * @src_x: Source x position
@ -1086,7 +1086,7 @@ typedef enum /*< prefix=COGL_FRAMEBUFFER_ERROR >*/
* COGL_SYSTEM_ERROR will be created. * COGL_SYSTEM_ERROR will be created.
*/ */
COGL_EXPORT gboolean COGL_EXPORT gboolean
cogl_blit_framebuffer (CoglFramebuffer *framebuffer, cogl_framebuffer_blit (CoglFramebuffer *framebuffer,
CoglFramebuffer *dst, CoglFramebuffer *dst,
int src_x, int src_x,
int src_y, int src_y,

2
src/backends/meta-screen-cast-monitor-stream-src.c
View File

@ -668,7 +668,7 @@ meta_screen_cast_monitor_stream_src_record_to_framebuffer (MetaScreenCastStreamS
CoglFramebuffer *view_framebuffer = CoglFramebuffer *view_framebuffer =
clutter_stage_view_get_framebuffer (view); clutter_stage_view_get_framebuffer (view);
cogl_blit_framebuffer (view_framebuffer, cogl_framebuffer_blit (view_framebuffer,
framebuffer, framebuffer,
0, 0, 0, 0,
x, y, x, y,

2
src/backends/meta-screen-cast-virtual-stream-src.c
View File

@ -442,7 +442,7 @@ meta_screen_cast_virtual_stream_src_record_to_framebuffer (MetaScreenCastStreamS
view = view_from_src (src); view = view_from_src (src);
view_framebuffer = clutter_stage_view_get_framebuffer (view); view_framebuffer = clutter_stage_view_get_framebuffer (view);
if (!cogl_blit_framebuffer (view_framebuffer, if (!cogl_framebuffer_blit (view_framebuffer,
framebuffer, framebuffer,
0, 0, 0, 0,
0, 0, 0, 0,

2
src/backends/native/meta-drm-buffer-gbm.c
View File

@ -343,7 +343,7 @@ meta_drm_buffer_gbm_blit_to_framebuffer (CoglScanout *scanout,
goto out; goto out;
} }
result = cogl_blit_framebuffer (COGL_FRAMEBUFFER (cogl_fbo), result = cogl_framebuffer_blit (COGL_FRAMEBUFFER (cogl_fbo),
framebuffer, framebuffer,
0, 0, 0, 0,
x, y, x, y,

4
src/backends/native/meta-onscreen-native.c
View File

@ -1055,7 +1055,7 @@ copy_shared_framebuffer_primary_gpu (CoglOnscreen *onscre
n_rectangles = mtk_region_num_rectangles (region); n_rectangles = mtk_region_num_rectangles (region);
if (n_rectangles == 0 || n_rectangles > MAX_RECTS) if (n_rectangles == 0 || n_rectangles > MAX_RECTS)
{ {
if (!cogl_blit_framebuffer (framebuffer, COGL_FRAMEBUFFER (dmabuf_fb), if (!cogl_framebuffer_blit (framebuffer, COGL_FRAMEBUFFER (dmabuf_fb),
0, 0, 0, 0, 0, 0, 0, 0,
width, height, width, height,
&error)) &error))
@ -1072,7 +1072,7 @@ copy_shared_framebuffer_primary_gpu (CoglOnscreen *onscre
{ {
MtkRectangle rectangle = mtk_region_get_rectangle (region, i); MtkRectangle rectangle = mtk_region_get_rectangle (region, i);
if (!cogl_blit_framebuffer (framebuffer, COGL_FRAMEBUFFER (dmabuf_fb), if (!cogl_framebuffer_blit (framebuffer, COGL_FRAMEBUFFER (dmabuf_fb),
rectangle.x, rectangle.y, rectangle.x, rectangle.y,
rectangle.x, rectangle.y, rectangle.x, rectangle.y,
rectangle.width, rectangle.height, rectangle.width, rectangle.height,