[Mesa-dev] [PATCH mesa 12/12] egl: add messages to a few assert() and turn a couple into unreachable()
Eric Engestrom
eric.engestrom at intel.com
Mon Oct 29 17:13:33 UTC 2018
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
---
src/egl/drivers/dri2/egl_dri2.c | 8 ++++----
src/egl/main/eglconfig.c | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 7d9e24d79ddf833802fb..93e34ff93aa5c96a8997 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -335,7 +335,7 @@ dri2_add_config(_EGLDisplay *disp, const __DRIconfig *dri_config, int id,
_eglLinkConfig(&conf->base);
}
else {
- assert(0);
+ unreachable("duplicates should not be possible");
return NULL;
}
@@ -1102,7 +1102,7 @@ dri2_create_context_attribs_error(int dri_error)
break;
default:
- assert(0);
+ assert(!"unknown dri_error code");
egl_error = EGL_BAD_MATCH;
break;
}
@@ -1809,7 +1809,7 @@ dri2_release_tex_image(_EGLDriver *drv,
target = GL_TEXTURE_2D;
break;
default:
- assert(0);
+ assert(!"missing texture target");
}
if (dri2_dpy->tex_buffer->base.version >= 3 &&
@@ -1872,7 +1872,7 @@ egl_error_from_dri_image_error(int dri_error)
case __DRI_IMAGE_ERROR_BAD_ACCESS:
return EGL_BAD_ACCESS;
default:
- assert(0);
+ assert(!"unknown dri_error code");
return EGL_BAD_ALLOC;
}
}
diff --git a/src/egl/main/eglconfig.c b/src/egl/main/eglconfig.c
index 0456adf3caaa8df9d5fc..a346f937bf3e8ba09944 100644
--- a/src/egl/main/eglconfig.c
+++ b/src/egl/main/eglconfig.c
@@ -327,7 +327,7 @@ _eglValidateConfig(const _EGLConfig *conf, EGLBoolean for_matching)
valid = EGL_FALSE;
break;
default:
- assert(0);
+ unreachable("check _eglValidationTable[]");
break;
}
break;
@@ -353,7 +353,7 @@ _eglValidateConfig(const _EGLConfig *conf, EGLBoolean for_matching)
EGL_OPENGL_BIT;
break;
default:
- assert(0);
+ unreachable("check _eglValidationTable[]");
mask = 0;
break;
}
--
Cheers,
Eric
More information about the mesa-dev
mailing list