4 files changed, 15 insertions, 13 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_buffer.h b/src/mesa/drivers/dri/radeon/radeon_buffer.h
index d32809ef1a..62cdfad4a0 100644
--- a/src/mesa/drivers/dri/radeon/radeon_buffer.h
+++ b/src/mesa/drivers/dri/radeon/radeon_buffer.h
@@ -36,6 +36,7 @@ struct radeon_renderbuffer
     unsigned int cpp;
     /* unsigned int offset; */
     unsigned int pitch;
+    unsigned int width;
     unsigned int height;
 
     /* boo Xorg 6.8.2 compat */
diff --git a/src/mesa/drivers/dri/radeon/radeon_cs_legacy.c b/src/mesa/drivers/dri/radeon/radeon_cs_legacy.c
index 8de928692a..ec3919ced6 100644
--- a/src/mesa/drivers/dri/radeon/radeon_cs_legacy.c
+++ b/src/mesa/drivers/dri/radeon/radeon_cs_legacy.c
@@ -309,7 +309,6 @@ static int cs_emit(struct radeon_cs *cs)
     radeon_cs_write_dword(cs, ull >> 32);
     radeon_cs_write_dword(cs, 0);
 
-
     r = cs_process_relocs(cs);
     if (r) {
         return 0;
@@ -330,10 +329,6 @@ static int cs_emit(struct radeon_cs *cs)
         return r;
     }
     cs_set_age(cs);
-        for (int i = 0; i < cs->cdw; i++) {
-            fprintf(stderr, "pkt[%04d]=0x%08X\n", i, cs->packets[i]);
-        }
-    exit(0);
     return 0;
 }
 
@@ -362,7 +357,7 @@ static int cs_need_flush(struct radeon_cs *cs)
     return (cs->relocs_total_size > (7*1024*1024));
 }
 
-struct radeon_cs_funcs  radeon_cs_funcs = {
+static struct radeon_cs_funcs  radeon_cs_legacy_funcs = {
     cs_create,
     cs_write_dword,
     cs_write_reloc,
@@ -383,7 +378,7 @@ struct radeon_cs_manager *radeon_cs_manager_legacy(struct radeon_context *ctx)
     if (csm == NULL) {
         return NULL;
     }
-    csm->base.funcs = &radeon_cs_funcs;
+    csm->base.funcs = &radeon_cs_legacy_funcs;
     csm->base.fd = ctx->dri.fd;
     csm->ctx = ctx;
     csm->pending_age = 1;
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
index 4f76fcf410..9cc91ac197 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.c
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
@@ -349,6 +349,14 @@ static const __DRItexOffsetExtension r300texOffsetExtension = {
     { __DRI_TEX_OFFSET, __DRI_TEX_OFFSET_VERSION },
    r300SetTexOffset,
 };
+
+void r300SetTexBuffer(__DRIcontext *pDRICtx,
+                      GLint target,
+                      __DRIdrawable *dPriv);
+static const __DRItexBufferExtension r300TexBufferExtension = {
+    { __DRI_TEX_BUFFER, __DRI_TEX_BUFFER_VERSION },
+   r300SetTexBuffer,
+};
 #endif
 
 /* Create the device specific screen private data struct.
@@ -1024,7 +1032,8 @@ radeonCreateScreen2(__DRIscreenPrivate *sPriv)
 #endif
 
 #if RADEON_COMMON && defined(RADEON_COMMON_FOR_R300)
-   //screen->extensions[i++] = &r300texOffsetExtension.base;
+   screen->extensions[i++] = &r300texOffsetExtension.base;
+   screen->extensions[i++] = &r300TexBufferExtension.base;
 #endif
 
    screen->extensions[i++] = NULL;
@@ -1455,8 +1464,6 @@ radeonInitScreen(__DRIscreenPrivate *psp)
 static const
 __DRIconfig **radeonInitScreen2(__DRIscreenPrivate *psp)
 {
-   fprintf(stderr, "DRI2 initialization\n");
-
    /* Calling driInitExtensions here, with a NULL context pointer,
     * does not actually enable the extensions.  It just makes sure
     * that all the dispatch offsets for all the extensions that
@@ -1480,8 +1487,6 @@ __DRIconfig **radeonInitScreen2(__DRIscreenPrivate *psp)
        return NULL;
     }
 
-   fprintf(stderr, "DRI2 initialized\n");
-
    /* for now fill in all modes */
    return radeonFillInModes( psp, 24, 24, 8, 1);
 }
@@ -1555,3 +1560,4 @@ const struct __DriverAPIRec driDriverAPI = {
    .CopySubBuffer   = r200CopySubBuffer,
 };
 #endif
+
diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.h b/src/mesa/drivers/dri/radeon/radeon_screen.h
index 7b9d036148..ccddbb8ae0 100644
--- a/src/mesa/drivers/dri/radeon/radeon_screen.h
+++ b/src/mesa/drivers/dri/radeon/radeon_screen.h
@@ -104,7 +104,7 @@ typedef struct radeon_screen {
    /* Configuration cache with default values for all contexts */
    driOptionCache optionCache;
 
-   const __DRIextension *extensions[8];
+   const __DRIextension *extensions[16];
 
    int num_gb_pipes;
 	drm_radeon_sarea_t *sarea;	/* Private SAREA data */