The upper layer (api/core) already checks and bails out if the provided value for context_api is invalid. Change the condition to an assert so that we can catch it as (if) we extend the API and forget to update one of the backends.
Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> --- src/waffle/cgl/cgl_display.m | 3 +-- src/waffle/core/wcore_config_attrs.c | 3 +-- src/waffle/egl/wegl_config.c | 6 ++---- src/waffle/egl/wegl_context.c | 6 ++---- src/waffle/egl/wegl_display.c | 3 +-- src/waffle/glx/glx_config.c | 3 +-- src/waffle/glx/glx_display.c | 3 +-- src/waffle/nacl/nacl_display.c | 3 +-- src/waffle/wgl/wgl_config.c | 3 +-- src/waffle/wgl/wgl_display.c | 3 +-- 10 files changed, 12 insertions(+), 24 deletions(-) diff --git a/src/waffle/cgl/cgl_display.m b/src/waffle/cgl/cgl_display.m index 015ca32..1820e6c 100644 --- a/src/waffle/cgl/cgl_display.m +++ b/src/waffle/cgl/cgl_display.m @@ -81,8 +81,7 @@ cgl_display_supports_context_api(struct wcore_display *wc_self, case WAFFLE_CONTEXT_OPENGL_ES3: return false; default: - wcore_error_internal("waffle_context_api has bad value %#x", - context_api); + assert(false); return false; } } diff --git a/src/waffle/core/wcore_config_attrs.c b/src/waffle/core/wcore_config_attrs.c index 8f362a9..c7c02d4 100644 --- a/src/waffle/core/wcore_config_attrs.c +++ b/src/waffle/core/wcore_config_attrs.c @@ -151,8 +151,7 @@ set_context_version_default(struct wcore_config_attrs *attrs) attrs->context_minor_version = 0; return true; default: - wcore_error_internal("attrs->context_api has bad value 0x%x", - attrs->context_api); + assert(false); return false; } } diff --git a/src/waffle/egl/wegl_config.c b/src/waffle/egl/wegl_config.c index ef35b45..bfa0b95 100644 --- a/src/waffle/egl/wegl_config.c +++ b/src/waffle/egl/wegl_config.c @@ -99,8 +99,7 @@ check_context_attrs(struct wegl_display *dpy, return true; default: - wcore_error_internal("context_api has bad value %#x", - attrs->context_api); + assert(false); return false; } } @@ -164,8 +163,7 @@ choose_real_config(struct wegl_display *dpy, attrib_list[renderable_index] = EGL_OPENGL_ES3_BIT_KHR; break; default: - wcore_error_internal("waffle_context_api has bad value %#x", - attrs->context_api); + assert(false); return NULL; } diff --git a/src/waffle/egl/wegl_context.c b/src/waffle/egl/wegl_context.c index f4ee6cd..fff8f94 100644 --- a/src/waffle/egl/wegl_context.c +++ b/src/waffle/egl/wegl_context.c @@ -49,8 +49,7 @@ bind_api(struct wegl_platform *plat, int32_t waffle_context_api) ok &= plat->eglBindAPI(EGL_OPENGL_ES_API); break; default: - wcore_error_internal("waffle_context_api has bad value #x%x", - waffle_context_api); + assert(false); return false; } @@ -131,8 +130,7 @@ create_real_context(struct wegl_config *config, break; default: - wcore_error_internal("waffle_context_api has bad value %#x", - waffle_context_api); + assert(false); return EGL_NO_CONTEXT; } diff --git a/src/waffle/egl/wegl_display.c b/src/waffle/egl/wegl_display.c index c9368fc..f05815f 100644 --- a/src/waffle/egl/wegl_display.c +++ b/src/waffle/egl/wegl_display.c @@ -147,8 +147,7 @@ wegl_display_supports_context_api(struct wcore_display *wc_dpy, case WAFFLE_CONTEXT_OPENGL_ES3: return dpy->KHR_create_context; default: - wcore_error_internal("waffle_context_api has bad value %#x", - waffle_context_api); + assert(false); return false; } } diff --git a/src/waffle/glx/glx_config.c b/src/waffle/glx/glx_config.c index fc88a7a..94fe040 100644 --- a/src/waffle/glx/glx_config.c +++ b/src/waffle/glx/glx_config.c @@ -128,8 +128,7 @@ glx_config_check_context_attrs(struct glx_display *dpy, return true; default: - wcore_error_internal("context_api has bad value %#x", - attrs->context_api); + assert(false); return false; } } diff --git a/src/waffle/glx/glx_display.c b/src/waffle/glx/glx_display.c index 24e967c..a0a8782 100644 --- a/src/waffle/glx/glx_display.c +++ b/src/waffle/glx/glx_display.c @@ -128,8 +128,7 @@ glx_display_supports_context_api(struct wcore_display *wc_self, case WAFFLE_CONTEXT_OPENGL_ES3: return self->EXT_create_context_es_profile; default: - wcore_error_internal("waffle_context_api has bad value %#x", - context_api); + assert(false); return false; } } diff --git a/src/waffle/nacl/nacl_display.c b/src/waffle/nacl/nacl_display.c index 7e18ba3..41e6206 100644 --- a/src/waffle/nacl/nacl_display.c +++ b/src/waffle/nacl/nacl_display.c @@ -76,8 +76,7 @@ nacl_display_supports_context_api(struct wcore_display *wc_self, case WAFFLE_CONTEXT_OPENGL_ES3: return false; default: - wcore_error_internal("waffle_context_api has bad value %#x", - context_api); + assert(false); return false; } } diff --git a/src/waffle/wgl/wgl_config.c b/src/waffle/wgl/wgl_config.c index a21ba71..dd0d85f 100644 --- a/src/waffle/wgl/wgl_config.c +++ b/src/waffle/wgl/wgl_config.c @@ -133,8 +133,7 @@ wgl_config_check_context_attrs(struct wgl_display *dpy, return true; default: - wcore_error_internal("context_api has bad value %#x", - attrs->context_api); + assert(false); return false; } } diff --git a/src/waffle/wgl/wgl_display.c b/src/waffle/wgl/wgl_display.c index 9b3b38e..ba468dd 100644 --- a/src/waffle/wgl/wgl_display.c +++ b/src/waffle/wgl/wgl_display.c @@ -268,8 +268,7 @@ wgl_display_supports_context_api(struct wcore_display *wc_self, case WAFFLE_CONTEXT_OPENGL_ES3: return self->EXT_create_context_es_profile; default: - wcore_error_internal("waffle_context_api has bad value %#x", - context_api); + assert(false); return false; } } -- 2.8.0 _______________________________________________ waffle mailing list waffle@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/waffle