Enable CB_DPATH by default.

diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index 695609d33c99b7e36274114ed4a53d1a71c210f6..89c9ed6fb024f2f2b446cd2143a91e1131edb287 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@ -52,7 +52,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //#define RADEON_VTXFMT_A
 //#define HW_VBOS
 //#define OPTIMIZE_ELTS
-//#define CB_DPATH
+#define CB_DPATH
 
 struct r300_context;
 typedef struct r300_context r300ContextRec;

diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c
index 79411e1dba7b60be745b8f794f8f89fcc279c807..94a98ca092486f4f6fabb4d9d1710e4e4526af86 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_ioctl.c
+++ b/src/mesa/drivers/dri/r300/r300_ioctl.c
@@ -552,6 +552,9 @@ static void r300Clear(GLcontext * ctx, GLbitfield mask, GLboolean all,
        swapped = r300->radeon.doPageFlip && (r300->radeon.sarea->pfCurrentPage == 1);
 
 #ifdef CB_DPATH
+       WARN_ONCE("CB_DPATH has been enabled.\nPlease let me know if this introduces new instabilities.\n");
+       /* Make sure it fits there. */
+       r300EnsureCmdBufSpace(r300, 419*3, __FUNCTION__);
        if(flags || bits)
                r300EmitClearState(ctx);
 #endif