[cairo-commit] 3 commits - .gitlab-ci.yml src/cairo-gl-glyphs.c src/cairo-gl-info.c src/cairo-gl-surface.c

[GitLab Mirror]

 .gitlab-ci.yml         |    1 +
 src/cairo-gl-glyphs.c  |    2 ++
 src/cairo-gl-info.c    |    6 ++++--
 src/cairo-gl-surface.c |    2 ++
 4 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 4823aa606b7a0785f918b2ced1463b07a2382cc1
Merge: 6e3cacc90 0f770dbce
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Mon May 9 21:30:35 2022 +0000

    Merge branch 'warnings' into 'master'
    
    Add -Werror for meson CI build
    
    See merge request cairo/cairo!320

commit 0f770dbce271917d63c2b0ff735125fc7912e3f7
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sat May 7 13:38:10 2022 +0930

    Add -Werror for meson CI build

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 46cc5f0cf..a5e08bb76 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -209,6 +209,7 @@ fedora meson build:
       ${DEFAULT_MESON_ARGS}
       -Dgl-backend=gl
   script:
+    - export CFLAGS="-Werror -Wno-error=deprecated-declarations"
     - meson builddir ${MESON_ARGS}
     - ninja -C builddir
     # - ninja -C builddir test
commit 0ea231fae5acef868840b026c1502c470d0fb89c
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Sat May 7 17:41:17 2022 +0930

    Fix GL warnings

diff --git a/src/cairo-gl-glyphs.c b/src/cairo-gl-glyphs.c
index 0384dbf24..f6f5ec096 100644
--- a/src/cairo-gl-glyphs.c
+++ b/src/cairo-gl-glyphs.c
@@ -181,6 +181,8 @@ cairo_gl_context_get_glyph_cache (cairo_gl_context_t *ctx,
     cairo_content_t content;
 
     switch (format) {
+    case CAIRO_FORMAT_RGBA128F:
+    case CAIRO_FORMAT_RGB96F:
     case CAIRO_FORMAT_RGB30:
     case CAIRO_FORMAT_RGB16_565:
     case CAIRO_FORMAT_ARGB32:
diff --git a/src/cairo-gl-info.c b/src/cairo-gl-info.c
index 53f5b1720..c655b962e 100644
--- a/src/cairo-gl-info.c
+++ b/src/cairo-gl-info.c
@@ -59,8 +59,9 @@ _cairo_gl_get_version (void)
 }
 
 
-cairo_gl_flavor_t
-_cairo_gl_degrade_flavor_by_build_features (cairo_gl_flavor_t flavor) {
+static cairo_gl_flavor_t
+_cairo_gl_degrade_flavor_by_build_features (cairo_gl_flavor_t flavor)
+{
     switch(flavor) {
     case CAIRO_GL_FLAVOR_DESKTOP:
 #if CAIRO_HAS_GL_SURFACE
@@ -83,6 +84,7 @@ _cairo_gl_degrade_flavor_by_build_features (cairo_gl_flavor_t flavor) {
 	/* intentional fall through: no OpenGL in first place or no surfaces for it's version */
 #endif
 
+    case CAIRO_GL_FLAVOR_NONE:
     default:
 	return CAIRO_GL_FLAVOR_NONE;
     }
diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c
index b0f42d6aa..e48244dd4 100644
--- a/src/cairo-gl-surface.c
+++ b/src/cairo-gl-surface.c
@@ -294,6 +294,8 @@ _cairo_gl_get_image_format_and_type_gl (pixman_format_code_t pixman_format,
     case PIXMAN_r8g8b8x8:
     case PIXMAN_r8g8b8a8:
     case PIXMAN_x14r6g6b6:
+    case PIXMAN_rgb_float:
+    case PIXMAN_rgba_float:
     default:
 	return FALSE;
     }