From a05caa63388a7616a01aa3c1fa518a45f6f58d4d Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Sun, 28 Jul 2024 15:22:07 +0200 Subject: [PATCH] cogl/texture2d: Rename from_egl_image constructor Similar to the from_egl_image_external one, to give it the correct namespace Part-of: --- cogl/cogl/cogl-texture-2d.c | 2 +- cogl/cogl/cogl-texture-2d.h | 8 ++++---- cogl/cogl/winsys/cogl-winsys-egl-x11.c | 2 +- src/backends/native/meta-drm-buffer-gbm.c | 2 +- src/backends/native/meta-renderer-native.c | 2 +- src/wayland/meta-wayland-buffer.c | 2 +- src/wayland/meta-wayland-dma-buf.c | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cogl/cogl/cogl-texture-2d.c b/cogl/cogl/cogl-texture-2d.c index b58e9da39..d08e53a2d 100644 --- a/cogl/cogl/cogl-texture-2d.c +++ b/cogl/cogl/cogl-texture-2d.c @@ -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 * provide a way to query these properties. */ CoglTexture * -cogl_egl_texture_2d_new_from_image (CoglContext *ctx, +cogl_texture_2d_new_from_egl_image (CoglContext *ctx, int width, int height, CoglPixelFormat format, diff --git a/cogl/cogl/cogl-texture-2d.h b/cogl/cogl/cogl-texture-2d.h index 388c18aff..a88b62100 100644 --- a/cogl/cogl/cogl-texture-2d.h +++ b/cogl/cogl/cogl-texture-2d.h @@ -202,15 +202,15 @@ typedef gboolean (*CoglTexture2DEGLImageExternalAlloc) (CoglTexture2D *tex_2d, GError **error); #endif -/** - * cogl_egl_texture_2d_new_from_image: (skip) - */ #if defined (HAVE_EGL) && defined (EGL_KHR_image_base) /* 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 * provide a way to query these properties. */ +/** + * cogl_texture_2d_new_from_egl_image: (skip) + */ COGL_EXPORT CoglTexture * -cogl_egl_texture_2d_new_from_image (CoglContext *ctx, +cogl_texture_2d_new_from_egl_image (CoglContext *ctx, int width, int height, CoglPixelFormat format, diff --git a/cogl/cogl/winsys/cogl-winsys-egl-x11.c b/cogl/cogl/winsys/cogl-winsys-egl-x11.c index 7de343d6a..588d77b2b 100644 --- a/cogl/cogl/winsys/cogl-winsys-egl-x11.c +++ b/cogl/cogl/winsys/cogl-winsys-egl-x11.c @@ -490,7 +490,7 @@ _cogl_winsys_texture_pixmap_x11_create (CoglTexturePixmapX11 *tex_pixmap) COGL_PIXEL_FORMAT_RGB_888); 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_height (tex), texture_format, diff --git a/src/backends/native/meta-drm-buffer-gbm.c b/src/backends/native/meta-drm-buffer-gbm.c index 4ca8fb0f4..01963cd75 100644 --- a/src/backends/native/meta-drm-buffer-gbm.c +++ b/src/backends/native/meta-drm-buffer-gbm.c @@ -318,7 +318,7 @@ meta_drm_buffer_gbm_blit_to_framebuffer (CoglScanout *scanout, } 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, height, cogl_format, diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c index 8b23e4cc3..786f57a93 100644 --- a/src/backends/native/meta-renderer-native.c +++ b/src/backends/native/meta-renderer-native.c @@ -680,7 +680,7 @@ meta_renderer_native_create_dma_buf_framebuffer (MetaRendererNative *renderer_n return NULL; 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, height, cogl_format, diff --git a/src/wayland/meta-wayland-buffer.c b/src/wayland/meta-wayland-buffer.c index ad01a1d85..d21d4bef2 100644 --- a/src/wayland/meta-wayland-buffer.c +++ b/src/wayland/meta-wayland-buffer.c @@ -539,7 +539,7 @@ egl_image_buffer_attach (MetaWaylandBuffer *buffer, return FALSE; 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, cogl_format, egl_image, diff --git a/src/wayland/meta-wayland-dma-buf.c b/src/wayland/meta-wayland-dma-buf.c index 1f8f0fac1..8a2b0ec66 100644 --- a/src/wayland/meta-wayland-dma-buf.c +++ b/src/wayland/meta-wayland-dma-buf.c @@ -426,7 +426,7 @@ meta_wayland_dma_buf_realize_texture (MetaWaylandBuffer *buffer, return FALSE; 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->height, cogl_format, @@ -488,7 +488,7 @@ meta_wayland_dma_buf_realize_texture (MetaWaylandBuffer *buffer, return FALSE; 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->height, subformat,