From 65396d99a1ce085ed6c06682bffd335458b6c6fe Mon Sep 17 00:00:00 2001 From: Sebastian Wick Date: Thu, 14 Sep 2023 18:49:08 +0200 Subject: [PATCH] cogl/texture-driver: Uploading COGL_PIXEL_FORMAT_ANY is always supported Fixes: a9c24ff65 ("multi-texture-format: Add P010 YCbCr format") --- cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c | 3 ++- cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 2b924abc212..b1e486a0393 100644 --- a/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c +++ b/cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c @@ -457,10 +457,11 @@ _cogl_texture_driver_upload_supported (CoglContext *ctx, case COGL_PIXEL_FORMAT_DEPTH_16: case COGL_PIXEL_FORMAT_DEPTH_32: case COGL_PIXEL_FORMAT_DEPTH_24_STENCIL_8: - case COGL_PIXEL_FORMAT_ANY: case COGL_PIXEL_FORMAT_YUV: g_assert_not_reached (); return FALSE; + case COGL_PIXEL_FORMAT_ANY: + return TRUE; } g_assert_not_reached (); 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 6abcd38dc2a..309f96918cd 100644 --- a/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c +++ b/cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c @@ -511,10 +511,11 @@ _cogl_texture_driver_upload_supported (CoglContext *ctx, case COGL_PIXEL_FORMAT_DEPTH_16: case COGL_PIXEL_FORMAT_DEPTH_32: case COGL_PIXEL_FORMAT_DEPTH_24_STENCIL_8: - case COGL_PIXEL_FORMAT_ANY: case COGL_PIXEL_FORMAT_YUV: g_assert_not_reached (); return FALSE; + case COGL_PIXEL_FORMAT_ANY: + return TRUE; } g_assert_not_reached (); -- GitLab