Mesa (master): mesa: remove ASSERT_NO_FEATURE macro

Ian Romanick idr at kemper.freedesktop.org
Tue Oct 16 22:01:35 UTC 2012


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

Author: Brian Paul <brianp at vmware.com>
Date:   Sat Sep 22 18:45:32 2012 -0600

mesa: remove ASSERT_NO_FEATURE macro

Was only used in one place.

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/mesa/main/api_validate.c |    2 +-
 src/mesa/main/mfeatures.h    |    3 ---
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index db9d14a..6f02508 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -148,7 +148,7 @@ check_valid_to_render(struct gl_context *ctx, const char *function)
       break;
 
    default:
-      ASSERT_NO_FEATURE();
+      assert(!"Invalid API value in check_valid_to_render()");
    }
 
    return GL_TRUE;
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 3162a0b..829c056 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -35,9 +35,6 @@
 #define _HAVE_FULL_GL 1
 #endif
 
-/* assert that a feature is disabled and should never be used */
-#define ASSERT_NO_FEATURE() ASSERT(0)
-
 #ifndef FEATURE_ES1
 #define FEATURE_ES1 0
 #endif




More information about the mesa-commit mailing list