From 5dbb6c31e9646b30e848462c6cf65ac9e7e871d6 Mon Sep 17 00:00:00 2001 From: Sebastian Wick Date: Thu, 14 Sep 2023 12:46:57 +0200 Subject: [PATCH] cogl: Rename COGL_PIXEL_FORMAT_G_16 with COGL_PIXEL_FORMAT_R_16 Mechanical rename. The format already describes the first two (rg/xy) components. Part-of: --- cogl/cogl/cogl-bitmap-conversion.c | 2 +- cogl/cogl/cogl-bitmap-packing.h | 4 ++-- cogl/cogl/cogl-pixel-format.c | 4 ++-- cogl/cogl/cogl-pixel-format.h | 4 ++-- cogl/cogl/driver/gl/gl/cogl-driver-gl.c | 2 +- cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c | 2 +- cogl/cogl/driver/gl/gles/cogl-driver-gles.c | 2 +- cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c | 2 +- src/common/meta-cogl-drm-formats.h | 2 +- src/compositor/meta-multi-texture-format.c | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cogl/cogl/cogl-bitmap-conversion.c b/cogl/cogl/cogl-bitmap-conversion.c index 83d5d9fc8..fe9a71fb8 100644 --- a/cogl/cogl/cogl-bitmap-conversion.c +++ b/cogl/cogl/cogl-bitmap-conversion.c @@ -316,7 +316,7 @@ _cogl_bitmap_needs_short_temp_buffer (CoglPixelFormat format) floats */ switch (format) { - case COGL_PIXEL_FORMAT_G_16: + case COGL_PIXEL_FORMAT_R_16: case COGL_PIXEL_FORMAT_RG_1616: case COGL_PIXEL_FORMAT_DEPTH_16: case COGL_PIXEL_FORMAT_DEPTH_32: diff --git a/cogl/cogl/cogl-bitmap-packing.h b/cogl/cogl/cogl-bitmap-packing.h index 182896a41..a488d11c7 100644 --- a/cogl/cogl/cogl-bitmap-packing.h +++ b/cogl/cogl/cogl-bitmap-packing.h @@ -536,7 +536,7 @@ G_PASTE (_cogl_unpack_, component_size) (CoglPixelFormat format, case COGL_PIXEL_FORMAT_ABGR_FP_16161616_PRE: G_PASTE (_cogl_unpack_argb_fp_16161616_, component_size) (src, dst, width); break; - case COGL_PIXEL_FORMAT_G_16: + case COGL_PIXEL_FORMAT_R_16: case COGL_PIXEL_FORMAT_RG_1616: case COGL_PIXEL_FORMAT_DEPTH_16: case COGL_PIXEL_FORMAT_DEPTH_32: @@ -1039,7 +1039,7 @@ G_PASTE (_cogl_pack_, component_size) (CoglPixelFormat format, case COGL_PIXEL_FORMAT_ABGR_FP_16161616_PRE: G_PASTE (_cogl_pack_argb_fp_16161616_, component_size) (src, dst, width); break; - case COGL_PIXEL_FORMAT_G_16: + case COGL_PIXEL_FORMAT_R_16: case COGL_PIXEL_FORMAT_RG_1616: case COGL_PIXEL_FORMAT_DEPTH_16: case COGL_PIXEL_FORMAT_DEPTH_32: diff --git a/cogl/cogl/cogl-pixel-format.c b/cogl/cogl/cogl-pixel-format.c index 251d07a3e..cc0154c6b 100644 --- a/cogl/cogl/cogl-pixel-format.c +++ b/cogl/cogl/cogl-pixel-format.c @@ -99,8 +99,8 @@ static const CoglPixelFormatInfo format_info_table[] = { .bpp = { 1 }, }, { - .cogl_format = COGL_PIXEL_FORMAT_G_16, - .format_str = "G_16", + .cogl_format = COGL_PIXEL_FORMAT_R_16, + .format_str = "R_16", .n_planes = 1, .aligned = 1, .bpp = { 2 }, diff --git a/cogl/cogl/cogl-pixel-format.h b/cogl/cogl/cogl-pixel-format.h index 544b45a36..9baf7981b 100644 --- a/cogl/cogl/cogl-pixel-format.h +++ b/cogl/cogl/cogl-pixel-format.h @@ -149,7 +149,7 @@ G_BEGIN_DECLS * @COGL_PIXEL_FORMAT_RGBA_5551: RGBA, 16 bits * @COGL_PIXEL_FORMAT_YUV: Not currently supported * @COGL_PIXEL_FORMAT_R_8: Single luminance component - * @COGL_PIXEL_FORMAT_G_16: Single luminance component, 16 bits + * @COGL_PIXEL_FORMAT_R_16: Single luminance component, 16 bits * @COGL_PIXEL_FORMAT_RGB_888: RGB, 24 bits * @COGL_PIXEL_FORMAT_BGR_888: BGR, 24 bits * @COGL_PIXEL_FORMAT_RGBX_8888: RGBX, 32 bits @@ -216,7 +216,7 @@ typedef enum /*< prefix=COGL_PIXEL_FORMAT >*/ COGL_PIXEL_FORMAT_RGBA_5551 = 6 | COGL_A_BIT, COGL_PIXEL_FORMAT_YUV = 7, COGL_PIXEL_FORMAT_R_8 = 8, - COGL_PIXEL_FORMAT_G_16 = 14, + COGL_PIXEL_FORMAT_R_16 = 14, COGL_PIXEL_FORMAT_RG_88 = 9, COGL_PIXEL_FORMAT_RG_1616 = 15, diff --git a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c index 358173ad4..03da01299 100644 --- a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c +++ b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c @@ -300,7 +300,7 @@ _cogl_driver_pixel_format_to_gl (CoglContext *context, gltype = GL_UNSIGNED_INT_24_8; break; - case COGL_PIXEL_FORMAT_G_16: + case COGL_PIXEL_FORMAT_R_16: case COGL_PIXEL_FORMAT_RG_1616: case COGL_PIXEL_FORMAT_ANY: case COGL_PIXEL_FORMAT_YUV: diff --git a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c index 4ce067fce..5babacb93 100644 --- a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c +++ b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c @@ -439,7 +439,7 @@ _cogl_texture_driver_upload_supported (CoglContext *ctx, case COGL_PIXEL_FORMAT_RGBA_FP_16161616: case COGL_PIXEL_FORMAT_RGBA_FP_16161616_PRE: return TRUE; - case COGL_PIXEL_FORMAT_G_16: + case COGL_PIXEL_FORMAT_R_16: case COGL_PIXEL_FORMAT_RG_1616: case COGL_PIXEL_FORMAT_DEPTH_16: case COGL_PIXEL_FORMAT_DEPTH_32: diff --git a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c index d0966b28d..123adb8dc 100644 --- a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c +++ b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c @@ -256,7 +256,7 @@ _cogl_driver_pixel_format_to_gl (CoglContext *context, gltype = GL_UNSIGNED_INT_24_8; break; - case COGL_PIXEL_FORMAT_G_16: + case COGL_PIXEL_FORMAT_R_16: case COGL_PIXEL_FORMAT_RG_1616: case COGL_PIXEL_FORMAT_ANY: case COGL_PIXEL_FORMAT_YUV: diff --git a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c index a80218d57..57231f15c 100644 --- a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c +++ b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c @@ -505,7 +505,7 @@ _cogl_texture_driver_upload_supported (CoglContext *ctx, return TRUE; else return FALSE; - case COGL_PIXEL_FORMAT_G_16: + case COGL_PIXEL_FORMAT_R_16: case COGL_PIXEL_FORMAT_RG_1616: case COGL_PIXEL_FORMAT_DEPTH_16: case COGL_PIXEL_FORMAT_DEPTH_32: diff --git a/src/common/meta-cogl-drm-formats.h b/src/common/meta-cogl-drm-formats.h index eb3b17e60..9eb865d98 100644 --- a/src/common/meta-cogl-drm-formats.h +++ b/src/common/meta-cogl-drm-formats.h @@ -40,7 +40,7 @@ static const CoglDrmFormatMap meta_cogl_drm_format_map[] = { /* DRM formats are defined as little-endian, not machine endian. */ #if G_BYTE_ORDER == G_LITTLE_ENDIAN { DRM_FORMAT_R8, COGL_PIXEL_FORMAT_R_8, META_MULTI_TEXTURE_FORMAT_INVALID }, - { DRM_FORMAT_R16, COGL_PIXEL_FORMAT_G_16, META_MULTI_TEXTURE_FORMAT_INVALID }, + { DRM_FORMAT_R16, COGL_PIXEL_FORMAT_R_16, META_MULTI_TEXTURE_FORMAT_INVALID }, { DRM_FORMAT_GR88, COGL_PIXEL_FORMAT_RG_88, META_MULTI_TEXTURE_FORMAT_INVALID }, { DRM_FORMAT_GR1616, COGL_PIXEL_FORMAT_RG_1616, META_MULTI_TEXTURE_FORMAT_INVALID }, { DRM_FORMAT_RGB565, COGL_PIXEL_FORMAT_RGB_565, META_MULTI_TEXTURE_FORMAT_SIMPLE }, diff --git a/src/compositor/meta-multi-texture-format.c b/src/compositor/meta-multi-texture-format.c index 22fbe240b..e5f8511bb 100644 --- a/src/compositor/meta-multi-texture-format.c +++ b/src/compositor/meta-multi-texture-format.c @@ -138,7 +138,7 @@ static MetaMultiTextureFormatInfo multi_format_table[] = { [META_MULTI_TEXTURE_FORMAT_P010] = { .name = "P010", .n_planes = 2, - .subformats = { COGL_PIXEL_FORMAT_G_16, COGL_PIXEL_FORMAT_RG_1616 }, + .subformats = { COGL_PIXEL_FORMAT_R_16, COGL_PIXEL_FORMAT_RG_1616 }, .plane_indices = { 0, 1 }, .hsub = { 1, 2 }, .vsub = { 1, 2 },