summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gmail.com>2020-03-10 15:59:41 +0000
committerEmmanuele Bassi <ebassi@gmail.com>2020-03-10 15:59:41 +0000
commit22431380e64b2bbd71a28613136dddb377624add (patch)
treeb550e926d45c48e0c46a0af18b859fb70ccbff45
parentff5dfc658042115392d9215a40afab3636b8461a (diff)
parentfc8b269e33ba179a55a79bf50cec62286ac50bc6 (diff)
downloadcogl-22431380e64b2bbd71a28613136dddb377624add.tar.gz
Merge branch 'wip/smcv/uninitialized' into 'cogl-1.22'
[1.22] Reassure gcc 9 that variables are not uninitialized See merge request GNOME/cogl!21
-rw-r--r--cogl/driver/gl/gles/cogl-driver-gles.c1
-rw-r--r--tests/conform/test-backface-culling.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/cogl/driver/gl/gles/cogl-driver-gles.c b/cogl/driver/gl/gles/cogl-driver-gles.c
index e94449f4..d8d1d0ad 100644
--- a/cogl/driver/gl/gles/cogl-driver-gles.c
+++ b/cogl/driver/gl/gles/cogl-driver-gles.c
@@ -201,6 +201,7 @@ _cogl_driver_pixel_format_to_gl (CoglContext *context,
case COGL_PIXEL_FORMAT_ANY:
case COGL_PIXEL_FORMAT_YUV:
+ default:
g_assert_not_reached ();
break;
}
diff --git a/tests/conform/test-backface-culling.c b/tests/conform/test-backface-culling.c
index e90c2f5e..c06ec79a 100644
--- a/tests/conform/test-backface-culling.c
+++ b/tests/conform/test-backface-culling.c
@@ -193,6 +193,9 @@ validate_result (CoglFramebuffer *framebuffer, int y_offset)
cull_front = TRUE;
cull_back = TRUE;
break;
+
+ default:
+ g_assert_not_reached ();
}
if (FRONT_WINDING (draw_num) == COGL_WINDING_CLOCKWISE)