intel: Disable creating DRI2 FBconfigs with depth size != color size.

[mesa.git] / src / mesa / drivers / dri / s3v / s3v_macros.h

diff --git a/src/mesa/drivers/dri/s3v/s3v_macros.h b/src/mesa/drivers/dri/s3v/s3v_macros.h
index b54d506788daa355e44f3a917571faaa7fc02464..7e9b4529df44fc99af146dea49207cd5fb61aa48 100644 (file)
--- a/src/mesa/drivers/dri/s3v/s3v_macros.h
+++ b/src/mesa/drivers/dri/s3v/s3v_macros.h
@@ -5,8 +5,6 @@
 #ifndef _S3V_MACROS_H_
 #define _S3V_MACROS_H_
 
-#ifdef GLX_DIRECT_RENDERING
-
 /**************/
 /* DRI macros */
 /**************/
@@ -18,25 +16,26 @@
 /* Note: The argument to DEBUG*() _must_ be enclosed in parenthesis */
 
 #if (GENERIC_DEBUG || FLOW_DEBUG || DMABUFS_DEBUG)
-       #include <stdio.h>
+#include <stdio.h>
 #endif
 
+#undef DEBUG
 #if GENERIC_DEBUG
-       #define DEBUG(str) printf str
+#define DEBUG(str) printf str
 #else
-       #define DEBUG(str)
+#define DEBUG(str)
 #endif
 
 #if FLOW_DEBUG
-       #define DEBUG_WHERE(str) printf str
+#define DEBUG_WHERE(str) printf str
 #else
-       #define DEBUG_WHERE(str)
+#define DEBUG_WHERE(str)
 #endif
 
 #if DMABUFS_DEBUG
-       #define DEBUG_BUFS(str) printf str
+#define DEBUG_BUFS(str) printf str
 #else
-       #define DEBUG_BUFS(str)
+#define DEBUG_BUFS(str)
 #endif
 
 
@@ -204,8 +203,6 @@ do { \
        DEBUG(("GOING HOME\n")); \
 } while (0)
 
-#endif
-
 /**************************/
 /* generic, global macros */
 /**************************/