cogl: Fix builds with G_DISABLE_ASSERT
Commit 25f416c13d
added additional compilation warnings, including
-Werror=return-type. There are several places where this results
in build failures if `g_assert_not_reached()` is disabled at compile
time and the compiler misses a return value.
https://gitlab.gnome.org/GNOME/mutter/issues/447
This commit is contained in:
parent
8655bc5d8d
commit
5c3ec27b4b
@ -355,6 +355,7 @@ _cogl_bitmap_needs_short_temp_buffer (CoglPixelFormat format)
|
|||||||
}
|
}
|
||||||
|
|
||||||
g_assert_not_reached ();
|
g_assert_not_reached ();
|
||||||
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
CoglBool
|
CoglBool
|
||||||
|
@ -112,6 +112,7 @@ update_hints_to_gl_enum (CoglBuffer *buffer)
|
|||||||
}
|
}
|
||||||
|
|
||||||
g_assert_not_reached ();
|
g_assert_not_reached ();
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static GLenum
|
static GLenum
|
||||||
|
@ -135,6 +135,7 @@ get_error_string (void)
|
|||||||
return "Invalid surface";
|
return "Invalid surface";
|
||||||
default:
|
default:
|
||||||
g_assert_not_reached ();
|
g_assert_not_reached ();
|
||||||
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -219,6 +220,7 @@ _cogl_winsys_renderer_connect (CoglRenderer *renderer,
|
|||||||
{
|
{
|
||||||
/* This function must be overridden by a platform winsys */
|
/* This function must be overridden by a platform winsys */
|
||||||
g_assert_not_reached ();
|
g_assert_not_reached ();
|
||||||
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -30,6 +30,7 @@ calc_coord_offset (int pos, int pos_index, int point_size)
|
|||||||
}
|
}
|
||||||
|
|
||||||
g_assert_not_reached ();
|
g_assert_not_reached ();
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -22,6 +22,7 @@ calc_coord_offset (int pos, int pos_index, int point_size)
|
|||||||
}
|
}
|
||||||
|
|
||||||
g_assert_not_reached ();
|
g_assert_not_reached ();
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
Loading…
Reference in New Issue
Block a user