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

cogl/framebuffer: Fix argument naming to blit_framebuffer()

Browse source 
The first argument is the framebuffer operated on, so in order to stay
consistest, rename 'src' to 'framebuffer'. The second is the
destination. The destination is commonly referred to as 'dst' elsewhere,
so rename 'dest' to 'dst'.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1496
This commit is contained in:
Jonas Ådahl 2020-10-12 22:58:01 +02:00 committed by Georges Basile Stavracas Neto
parent 4edcc21a5c
commit e720ef1ceb
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cogl/cogl/cogl-framebuffer.c
View file

@ -1277,8 +1277,8 @@ cogl_framebuffer_read_pixels (CoglFramebuffer *framebuffer,
} }
gboolean gboolean
cogl_blit_framebuffer (CoglFramebuffer *src, cogl_blit_framebuffer (CoglFramebuffer *framebuffer,
CoglFramebuffer *dest, CoglFramebuffer *dst,
int src_x, int src_x,
int src_y, int src_y,
int dst_x, int dst_x,
@ -1287,7 +1287,7 @@ cogl_blit_framebuffer (CoglFramebuffer *src,
int height, int height,
GError **error) GError **error)
{ {
CoglContext *ctx = src->context; CoglContext *ctx = framebuffer->context;
int src_x1, src_y1, src_x2, src_y2; int src_x1, src_y1, src_x2, src_y2;
int dst_x1, dst_y1, dst_x2, dst_y2; int dst_x1, dst_y1, dst_x2, dst_y2;
@ -1300,8 +1300,8 @@ cogl_blit_framebuffer (CoglFramebuffer *src,
} }
/* The buffers must use the same premult convention */ /* The buffers must use the same premult convention */
if ((src->internal_format & COGL_PREMULT_BIT) != if ((framebuffer->internal_format & COGL_PREMULT_BIT) !=
(dest->internal_format & COGL_PREMULT_BIT)) (dst->internal_format & COGL_PREMULT_BIT))
{ {
g_set_error_literal (error, COGL_SYSTEM_ERROR, g_set_error_literal (error, COGL_SYSTEM_ERROR,
COGL_SYSTEM_ERROR_UNSUPPORTED, COGL_SYSTEM_ERROR_UNSUPPORTED,
@ -1312,12 +1312,12 @@ cogl_blit_framebuffer (CoglFramebuffer *src,
/* Make sure any batched primitives get submitted to the driver /* Make sure any batched primitives get submitted to the driver
* before blitting * before blitting
*/ */
_cogl_framebuffer_flush_journal (src); _cogl_framebuffer_flush_journal (framebuffer);
/* Make sure the current framebuffers are bound. We explicitly avoid /* Make sure the current framebuffers are bound. We explicitly avoid
flushing the clip state so we can bind our own empty state */ flushing the clip state so we can bind our own empty state */
_cogl_framebuffer_flush_state (dest, _cogl_framebuffer_flush_state (dst,
src, framebuffer,
COGL_FRAMEBUFFER_STATE_ALL & COGL_FRAMEBUFFER_STATE_ALL &
~COGL_FRAMEBUFFER_STATE_CLIP); ~COGL_FRAMEBUFFER_STATE_CLIP);
@ -1325,7 +1325,7 @@ cogl_blit_framebuffer (CoglFramebuffer *src,
by the scissor and we want to hide this feature for the Cogl API by the scissor and we want to hide this feature for the Cogl API
because it's not obvious to an app how the clip state will affect because it's not obvious to an app how the clip state will affect
the scissor */ the scissor */
_cogl_clip_stack_flush (NULL, dest); _cogl_clip_stack_flush (NULL, dst);
/* XXX: Because we are manually flushing clip state here we need to /* XXX: Because we are manually flushing clip state here we need to
* make sure that the clip state gets updated the next time we flush * make sure that the clip state gets updated the next time we flush
@ -1336,7 +1336,7 @@ cogl_blit_framebuffer (CoglFramebuffer *src,
/* Offscreens we do the normal way, onscreens need an y-flip. Even if /* Offscreens we do the normal way, onscreens need an y-flip. Even if
* we consider offscreens to be rendered upside-down, the offscreen * we consider offscreens to be rendered upside-down, the offscreen
* orientation is in this function's API. */ * orientation is in this function's API. */
if (cogl_is_offscreen (src)) if (cogl_is_offscreen (framebuffer))
{ {
src_x1 = src_x; src_x1 = src_x;
src_y1 = src_y; src_y1 = src_y;
@ -1346,12 +1346,12 @@ cogl_blit_framebuffer (CoglFramebuffer *src,
else else
{ {
src_x1 = src_x; src_x1 = src_x;
src_y1 = cogl_framebuffer_get_height (src) - src_y; src_y1 = cogl_framebuffer_get_height (framebuffer) - src_y;
src_x2 = src_x + width; src_x2 = src_x + width;
src_y2 = src_y1 - height; src_y2 = src_y1 - height;
} }
if (cogl_is_offscreen (dest)) if (cogl_is_offscreen (dst))
{ {
dst_x1 = dst_x; dst_x1 = dst_x;
dst_y1 = dst_y; dst_y1 = dst_y;
@ -1361,7 +1361,7 @@ cogl_blit_framebuffer (CoglFramebuffer *src,
else else
{ {
dst_x1 = dst_x; dst_x1 = dst_x;
dst_y1 = cogl_framebuffer_get_height (dest) - dst_y; dst_y1 = cogl_framebuffer_get_height (dst) - dst_y;
dst_x2 = dst_x + width; dst_x2 = dst_x + width;
dst_y2 = dst_y1 - height; dst_y2 = dst_y1 - height;
} }

8
cogl/cogl/cogl-framebuffer.h
View file

@ -1495,8 +1495,8 @@ cogl_is_framebuffer (void *object);
/** /**
* cogl_blit_framebuffer: * cogl_blit_framebuffer:
* @src: The source #CoglFramebuffer * @framebuffer: The source #CoglFramebuffer
* @dest: The destination #CoglFramebuffer * @dst: The destination #CoglFramebuffer
* @src_x: Source x position * @src_x: Source x position
* @src_y: Source y position * @src_y: Source y position
* @dst_x: Destination x position * @dst_x: Destination x position
@ -1546,8 +1546,8 @@ cogl_is_framebuffer (void *object);
* COGL_SYSTEM_ERROR will be created. * COGL_SYSTEM_ERROR will be created.
*/ */
COGL_EXPORT gboolean COGL_EXPORT gboolean
cogl_blit_framebuffer (CoglFramebuffer *src, cogl_blit_framebuffer (CoglFramebuffer *framebuffer,
CoglFramebuffer *dest, CoglFramebuffer *dst,
int src_x, int src_x,
int src_y, int src_y,
int dst_x, int dst_x,