Merge commit 'origin/master' into gallium-msaa

[mesa.git] / src / gallium / auxiliary / util / u_caps.h

diff --git a/src/gallium/auxiliary/util/u_caps.h b/src/gallium/auxiliary/util/u_caps.h
index 649af8ed20c2085e95dbfb3ca90577d93fb63045..b1074f9eb2134de7642b2e403349c22b052d4df9 100644 (file)
--- a/src/gallium/auxiliary/util/u_caps.h
+++ b/src/gallium/auxiliary/util/u_caps.h
@@ -38,6 +38,7 @@ enum u_caps_check_enum {
    UTIL_CAPS_CHECK_INT,
    UTIL_CAPS_CHECK_FLOAT,
    UTIL_CAPS_CHECK_FORMAT,
+   UTIL_CAPS_CHECK_UNIMPLEMENTED,
 };
 
 #define UTIL_CHECK_CAP(cap) \
@@ -53,11 +54,14 @@ enum u_caps_check_enum {
 #define UTIL_CHECK_FORMAT(format) \
    UTIL_CAPS_CHECK_FORMAT, PIPE_FORMAT_##format
 
+#define UTIL_CHECK_UNIMPLEMENTED \
+   UTIL_CAPS_CHECK_UNIMPLEMENTED
+
 #define UTIL_CHECK_TERMINATE \
    UTIL_CAPS_CHECK_TERMINATE
 
-boolean util_check_caps(struct pipe_screen *screen, unsigned *list);
-boolean util_check_caps_out(struct pipe_screen *screen, unsigned *list, int *out);
-void util_caps_print_debug(struct pipe_screen *screen);
+boolean util_check_caps(struct pipe_screen *screen, const unsigned *list);
+boolean util_check_caps_out(struct pipe_screen *screen, const unsigned *list, int *out);
+void util_caps_demo_print(struct pipe_screen *screen);
 
 #endif