i965/nir: Do not scalarize phis in non-scalar setups

[mesa.git] / src / mesa / drivers / dri / radeon / radeon_debug.c

diff --git a/src/mesa/drivers/dri/radeon/radeon_debug.c b/src/mesa/drivers/dri/radeon/radeon_debug.c
index 691680e956b20aa7901aae5507cef6b9afca3bf7..7ddba1ae85f172cf2172947a6d82ddad8b456a93 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_debug.c
+++ b/src/mesa/drivers/dri/radeon/radeon_debug.c
@@ -29,14 +29,17 @@
 
 #include "utils.h"
 
-#include "radeon_debug.h"
 #include "radeon_common_context.h"
+#include "radeon_debug.h"
+
+#include <stdarg.h>
+#include <stdio.h>
 
 static const struct dri_debug_control debug_control[] = {
        {"fall", RADEON_FALLBACKS},
        {"tex", RADEON_TEXTURE},
        {"ioctl", RADEON_IOCTL},
-       {"verts", RADEON_RENDER},
+       {"verts", RADEON_VERTS},
        {"render", RADEON_RENDER},
        {"swrender", RADEON_SWRENDER},
        {"state", RADEON_STATE},
@@ -85,14 +88,21 @@ void _radeon_debug_remove_indent(void)
        }
 }
 
-extern void _radeon_print(const radeon_debug_type_t type,
+void _radeon_print(const radeon_debug_type_t type,
           const radeon_debug_level_t level,
           const char* message,
-          va_list values)
+          ...)
 {
+       va_list values;
+
        GET_CURRENT_CONTEXT(ctx);
-       radeonContextPtr radeon = RADEON_CONTEXT(ctx);
-       // FIXME: Make this multi thread safe
-       fprintf(stderr, "%s", radeon->debug.indent);
+       if (ctx) {
+               radeonContextPtr radeon = RADEON_CONTEXT(ctx);
+               // FIXME: Make this multi thread safe
+               if (radeon->debug.indent_depth)
+                       fprintf(stderr, "%s", radeon->debug.indent);
+       }
+       va_start( values, message );
        vfprintf(stderr, message, values);
+       va_end( values );
 }