radeon: move debug symbol add DRI2

diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index fd41171de818baf281fbce806b0cf4d105c3cb2d..856c5fc596c5957911f19821e56618c2ea1bf45b 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -82,9 +82,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "vblank.h"
 #include "utils.h"
 #include "xmlpool.h" /* for symbolic values of enum-type options */
-#ifndef R200_DEBUG
-int R200_DEBUG = (0);
-#endif
 
 /* Return various strings for glGetString().
  */

diff --git a/src/mesa/drivers/dri/r300/radeon_context.c b/src/mesa/drivers/dri/r300/radeon_context.c
index 96478640cc196f9862e4fe76201dacdfe52c78fe..6884967663957484d917696a0aeba864a3f3317c 100644 (file)
--- a/src/mesa/drivers/dri/r300/radeon_context.c
+++ b/src/mesa/drivers/dri/r300/radeon_context.c
@@ -84,6 +84,8 @@ static const GLubyte *radeonGetString(GLcontext * ctx, GLenum name)
                        radeon->radeonScreen->AGPMode;
                const char* chipname;
 
+                       
+
                if (IS_R300_CLASS(radeon->radeonScreen))
                        chipname = "R300";
                else
@@ -93,15 +95,18 @@ static const GLubyte *radeonGetString(GLcontext * ctx, GLenum name)
                                              agp_mode);
 
                if (IS_R300_CLASS(radeon->radeonScreen)) {
-               sprintf(&buffer[offset], " %sTCL",
-                       (radeon->radeonScreen->chip_flags & RADEON_CHIPSET_TCL)
-                       ? "" : "NO-");
+                       sprintf(&buffer[offset], " %sTCL",
+                               (radeon->radeonScreen->chip_flags & RADEON_CHIPSET_TCL)
+                               ? "" : "NO-");
                } else {
                        sprintf(&buffer[offset], " %sTCL",
-                       !(radeon->TclFallback & RADEON_TCL_FALLBACK_TCL_DISABLE)
-                       ? "" : "NO-");
+                               !(radeon->TclFallback & RADEON_TCL_FALLBACK_TCL_DISABLE)
+                               ? "" : "NO-");
                }
 
+               if (radeon->radeonScreen->driScreen->dri2.enabled)
+                       strcat(buffer, " DRI2");
+
                return (GLubyte *) buffer;
        }
 

diff --git a/src/mesa/drivers/dri/radeon/common_misc.c b/src/mesa/drivers/dri/radeon/common_misc.c
index ba3c76daa906b282cd7326f73e8cc802cf21c4ad..95e2efd5e8e2aed4dddbe09c9afbced2f59e12d8 100644 (file)
--- a/src/mesa/drivers/dri/radeon/common_misc.c
+++ b/src/mesa/drivers/dri/radeon/common_misc.c
@@ -65,6 +65,10 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "common_misc.h"
 #include "common_lock.h"
 
+#ifndef RADEON_DEBUG
+int RADEON_DEBUG = (0);
+#endif
+
 /* =============================================================
  * Scissoring
  */

diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c
index 1adef7c7020c65deb2c6d05f6addd2f231f874d8..c7adf4975ba581f449e1f347214d354c06592154 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_context.c
@@ -75,10 +75,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "vblank.h"
 #include "utils.h"
 #include "xmlpool.h" /* for symbolic values of enum-type options */
-#ifndef RADEON_DEBUG
-int RADEON_DEBUG = (0);
-#endif
-
 
 /* Return various strings for glGetString().
  */

diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index e655408338aa656470b37f7148ef9b30e0da6781..0b6791f54c785753fa8de147c02787377dd540c3 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -212,7 +212,6 @@ DRI_CONF_END;
 static const GLuint __driNConfigOptions = 17;
 
 #ifndef RADEON_DEBUG
-int RADEON_DEBUG = 0;
 
 static const struct dri_debug_control debug_control[] = {
        {"fall", DEBUG_FALLBACKS},