Mesa (master): egl: turn a couple asserts static (compile-time)

Emil Velikov evelikov at kemper.freedesktop.org
Wed Aug 24 11:10:14 UTC 2016


Module: Mesa
Branch: master
Commit: 49dad1aafda974dd676dfd2c87da071749e1334f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=49dad1aafda974dd676dfd2c87da071749e1334f

Author: Eric Engestrom <eric at engestrom.ch>
Date:   Mon Aug 22 21:52:03 2016 +0100

egl: turn a couple asserts static (compile-time)

Signed-off-by: Eric Engestrom <eric at engestrom.ch>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/egl/main/eglconfig.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/egl/main/eglconfig.c b/src/egl/main/eglconfig.c
index 435d924..6161d26 100644
--- a/src/egl/main/eglconfig.c
+++ b/src/egl/main/eglconfig.c
@@ -38,6 +38,7 @@
 #include <assert.h>
 #include "c99_compat.h"
 
+#include "eglcompiler.h"
 #include "eglconfig.h"
 #include "egldisplay.h"
 #include "eglcurrent.h"
@@ -598,14 +599,14 @@ _eglCompareConfigs(const _EGLConfig *conf1, const _EGLConfig *conf2,
       return 0;
 
    /* the enum values have the desired ordering */
-   assert(EGL_NONE < EGL_SLOW_CONFIG);
-   assert(EGL_SLOW_CONFIG < EGL_NON_CONFORMANT_CONFIG);
+   STATIC_ASSERT(EGL_NONE < EGL_SLOW_CONFIG);
+   STATIC_ASSERT(EGL_SLOW_CONFIG < EGL_NON_CONFORMANT_CONFIG);
    val1 = conf1->ConfigCaveat - conf2->ConfigCaveat;
    if (val1)
       return val1;
 
    /* the enum values have the desired ordering */
-   assert(EGL_RGB_BUFFER < EGL_LUMINANCE_BUFFER);
+   STATIC_ASSERT(EGL_RGB_BUFFER < EGL_LUMINANCE_BUFFER);
    val1 = conf1->ColorBufferType - conf2->ColorBufferType;
    if (val1)
       return val1;




More information about the mesa-commit mailing list