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

cogl/texture2d: Rename from_egl_image constructor

Browse source 
Similar to the from_egl_image_external one, to give it the correct
namespace

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3910>
This commit is contained in:
Bilal Elmoussaoui 2024-07-28 15:22:07 +02:00 committed by Marge Bot
parent a9ec604eba
commit a05caa6338
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cogl/cogl/cogl-texture-2d.c
View file

@ -455,7 +455,7 @@ cogl_texture_2d_new_from_data (CoglContext *ctx,
* even though they may seem redundant is because GLES 1/2 don't * even though they may seem redundant is because GLES 1/2 don't
* provide a way to query these properties. */ * provide a way to query these properties. */
CoglTexture * CoglTexture *
cogl_egl_texture_2d_new_from_image (CoglContext *ctx, cogl_texture_2d_new_from_egl_image (CoglContext *ctx,
int width, int width,
int height, int height,
CoglPixelFormat format, CoglPixelFormat format,

8
cogl/cogl/cogl-texture-2d.h
View file

@ -202,15 +202,15 @@ typedef gboolean (*CoglTexture2DEGLImageExternalAlloc) (CoglTexture2D *tex_2d,
GError **error); GError **error);
#endif #endif
/**
* cogl_egl_texture_2d_new_from_image: (skip)
*/
#if defined (HAVE_EGL) && defined (EGL_KHR_image_base) #if defined (HAVE_EGL) && defined (EGL_KHR_image_base)
/* NB: The reason we require the width, height and format to be passed /* NB: The reason we require the width, height and format to be passed
* even though they may seem redundant is because GLES 1/2 don't * even though they may seem redundant is because GLES 1/2 don't
* provide a way to query these properties. */ * provide a way to query these properties. */
/**
* cogl_texture_2d_new_from_egl_image: (skip)
*/
COGL_EXPORT CoglTexture * COGL_EXPORT CoglTexture *
cogl_egl_texture_2d_new_from_image (CoglContext *ctx, cogl_texture_2d_new_from_egl_image (CoglContext *ctx,
int width, int width,
int height, int height,
CoglPixelFormat format, CoglPixelFormat format,

2
cogl/cogl/winsys/cogl-winsys-egl-x11.c
View file

@ -490,7 +490,7 @@ _cogl_winsys_texture_pixmap_x11_create (CoglTexturePixmapX11 *tex_pixmap)
COGL_PIXEL_FORMAT_RGB_888); COGL_PIXEL_FORMAT_RGB_888);
egl_tex_pixmap->texture = egl_tex_pixmap->texture =
cogl_egl_texture_2d_new_from_image (ctx, cogl_texture_2d_new_from_egl_image (ctx,
cogl_texture_get_width (tex), cogl_texture_get_width (tex),
cogl_texture_get_height (tex), cogl_texture_get_height (tex),
texture_format, texture_format,

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

@ -318,7 +318,7 @@ meta_drm_buffer_gbm_blit_to_framebuffer (CoglScanout *scanout,
} }
flags = COGL_EGL_IMAGE_FLAG_NO_GET_DATA; flags = COGL_EGL_IMAGE_FLAG_NO_GET_DATA;
cogl_tex = cogl_egl_texture_2d_new_from_image (cogl_context, cogl_tex = cogl_texture_2d_new_from_egl_image (cogl_context,
width, width,
height, height,
cogl_format, cogl_format,

2
src/backends/native/meta-renderer-native.c
View file

@ -680,7 +680,7 @@ meta_renderer_native_create_dma_buf_framebuffer (MetaRendererNative *renderer_n
return NULL; return NULL;
flags = COGL_EGL_IMAGE_FLAG_NO_GET_DATA; flags = COGL_EGL_IMAGE_FLAG_NO_GET_DATA;
cogl_tex = cogl_egl_texture_2d_new_from_image (cogl_context, cogl_tex = cogl_texture_2d_new_from_egl_image (cogl_context,
width, width,
height, height,
cogl_format, cogl_format,

2
src/wayland/meta-wayland-buffer.c
View file

@ -539,7 +539,7 @@ egl_image_buffer_attach (MetaWaylandBuffer *buffer,
return FALSE; return FALSE;
flags = COGL_EGL_IMAGE_FLAG_NONE; flags = COGL_EGL_IMAGE_FLAG_NONE;
texture_2d = cogl_egl_texture_2d_new_from_image (cogl_context, texture_2d = cogl_texture_2d_new_from_egl_image (cogl_context,
width, height, width, height,
cogl_format, cogl_format,
egl_image, egl_image,

4
src/wayland/meta-wayland-dma-buf.c
View file

@ -426,7 +426,7 @@ meta_wayland_dma_buf_realize_texture (MetaWaylandBuffer *buffer,
return FALSE; return FALSE;
flags = COGL_EGL_IMAGE_FLAG_NO_GET_DATA; flags = COGL_EGL_IMAGE_FLAG_NO_GET_DATA;
cogl_texture = cogl_egl_texture_2d_new_from_image (cogl_context, cogl_texture = cogl_texture_2d_new_from_egl_image (cogl_context,
dma_buf->width, dma_buf->width,
dma_buf->height, dma_buf->height,
cogl_format, cogl_format,
@ -488,7 +488,7 @@ meta_wayland_dma_buf_realize_texture (MetaWaylandBuffer *buffer,
return FALSE; return FALSE;
flags = COGL_EGL_IMAGE_FLAG_NO_GET_DATA; flags = COGL_EGL_IMAGE_FLAG_NO_GET_DATA;
cogl_texture = cogl_egl_texture_2d_new_from_image (cogl_context, cogl_texture = cogl_texture_2d_new_from_egl_image (cogl_context,
dma_buf->width, dma_buf->width,
dma_buf->height, dma_buf->height,
subformat, subformat,