ilo: add ilo_debug.[ch] to core

They consist of the debug helpers that used to live in ilo_common.h and
ilo_screen.c.

1 files changed, 1 insertions, 67 deletions

diff --git a/src/gallium/drivers/ilo/ilo_common.h b/src/gallium/drivers/ilo/ilo_common.h
index b685c446fc5..996de022901 100644
--- a/src/gallium/drivers/ilo/ilo_common.h
+++ b/src/gallium/drivers/ilo/ilo_common.h
@@ -29,35 +29,13 @@
 #define ILO_COMMON_H
 
 #include "core/ilo_core.h"
+#include "core/ilo_debug.h"
 
 #define ILO_GEN(gen) ((int) (gen * 100))
 
-/* enable debug flags affecting hot pathes only with debug builds */
-#ifdef DEBUG
-#define ILO_DEBUG_HOT 1
-#else
-#define ILO_DEBUG_HOT 0
-#endif
-
 #define ILO_DEV_ASSERT(dev, min_gen, max_gen) \
    ilo_dev_assert(dev, ILO_GEN(min_gen), ILO_GEN(max_gen))
 
-enum ilo_debug {
-   ILO_DEBUG_BATCH     = 1 << 0,
-   ILO_DEBUG_VS        = 1 << 1,
-   ILO_DEBUG_GS        = 1 << 2,
-   ILO_DEBUG_FS        = 1 << 3,
-   ILO_DEBUG_CS        = 1 << 4,
-   ILO_DEBUG_DRAW      = ILO_DEBUG_HOT << 5,
-   ILO_DEBUG_SUBMIT    = 1 << 6,
-   ILO_DEBUG_HANG      = 1 << 7,
-
-   /* flags that affect the behaviors of the driver */
-   ILO_DEBUG_NOHW      = 1 << 20,
-   ILO_DEBUG_NOCACHE   = 1 << 21,
-   ILO_DEBUG_NOHIZ     = 1 << 22,
-};
-
 struct ilo_dev_info {
    /* these mirror intel_winsys_info */
    int devid;
@@ -79,8 +57,6 @@ struct ilo_dev_info {
    int urb_size;
 };
 
-extern int ilo_debug;
-
 static inline int
 ilo_dev_gen(const struct ilo_dev_info *dev)
 {
@@ -93,46 +69,4 @@ ilo_dev_assert(const struct ilo_dev_info *dev, int min_opqaue, int max_opqaue)
    assert(dev->gen_opaque >= min_opqaue && dev->gen_opaque <= max_opqaue);
 }
 
-/**
- * Print a message, for dumping or debugging.
- */
-static inline void _util_printf_format(1, 2)
-ilo_printf(const char *format, ...)
-{
-   va_list ap;
-
-   va_start(ap, format);
-   _debug_vprintf(format, ap);
-   va_end(ap);
-}
-
-/**
- * Print a critical error.
- */
-static inline void _util_printf_format(1, 2)
-ilo_err(const char *format, ...)
-{
-   va_list ap;
-
-   va_start(ap, format);
-   _debug_vprintf(format, ap);
-   va_end(ap);
-}
-
-/**
- * Print a warning, silenced for release builds.
- */
-static inline void _util_printf_format(1, 2)
-ilo_warn(const char *format, ...)
-{
-#ifdef DEBUG
-   va_list ap;
-
-   va_start(ap, format);
-   _debug_vprintf(format, ap);
-   va_end(ap);
-#else
-#endif
-}
-
 #endif /* ILO_COMMON_H */