r200: clear is working at least - not much else

7 files changed, 15 insertions, 663 deletions

diff --git a/src/mesa/drivers/dri/r300/r300_context.c b/src/mesa/drivers/dri/r300/r300_context.c
index 3647022622..798f1f58c9 100644
--- a/src/mesa/drivers/dri/r300/r300_context.c
+++ b/src/mesa/drivers/dri/r300/r300_context.c
@@ -496,8 +496,6 @@ void r300DestroyContext(__DRIcontextPrivate * driContextPriv)
 		 * state, so don't destroy it earlier
 		 */
 
-		/* free the option cache */
-		driDestroyOptionCache(&r300->radeon.optionCache);
 
 		FREE(r300);
 	}
diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h
index 8449d00d37..477756774d 100644
--- a/src/mesa/drivers/dri/r300/r300_context.h
+++ b/src/mesa/drivers/dri/r300/r300_context.h
@@ -700,19 +700,11 @@ struct r500_fragment_program {
 #define REG_COLOR0	1
 #define REG_TEX0	2
 
-struct r300_aos {
-	struct radeon_bo *bo; /** Buffer object where vertex data is stored */
-	int offset; /** Offset into buffer object, in bytes */
-	int components; /** Number of components per vertex */
-	int stride; /** Stride in dwords (may be 0 for repeating) */
-	int count; /** Number of vertices */
-};
-
 struct r300_state {
 	struct r300_texture_state texture;
 	int sw_tcl_inputs[VERT_ATTRIB_MAX];
 	struct r300_vertex_shader_state vertex_shader;
-	struct r300_aos aos[R300_MAX_AOS_ARRAYS];
+	struct radeon_aos aos[R300_MAX_AOS_ARRAYS];
 	int aos_count;
 
 	struct radeon_bo *elt_dma_bo; /** Buffer object that contains element indices */
diff --git a/src/mesa/drivers/dri/r300/r300_emit.c b/src/mesa/drivers/dri/r300/r300_emit.c
index bf33c18979..e2d90a843e 100644
--- a/src/mesa/drivers/dri/r300/r300_emit.c
+++ b/src/mesa/drivers/dri/r300/r300_emit.c
@@ -63,141 +63,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #define DEBUG_ALL DEBUG_VERTS
 
-#if defined(USE_X86_ASM)
-#define COPY_DWORDS( dst, src, nr )					\
-do {									\
-	int __tmp;							\
-	__asm__ __volatile__( "rep ; movsl"				\
-			      : "=%c" (__tmp), "=D" (dst), "=S" (__tmp)	\
-			      : "0" (nr),				\
-			        "D" ((long)dst),			\
-			        "S" ((long)src) );			\
-} while (0)
-#else
-#define COPY_DWORDS( dst, src, nr )		\
-do {						\
-   int j;					\
-   for ( j = 0 ; j < nr ; j++ )			\
-      dst[j] = ((int *)src)[j];			\
-   dst += nr;					\
-} while (0)
-#endif
-
-static void r300EmitVec4(uint32_t *out, GLvoid * data, int stride, int count)
-{
-	int i;
-
-	if (RADEON_DEBUG & DEBUG_VERTS)
-		fprintf(stderr, "%s count %d stride %d out %p data %p\n",
-			__FUNCTION__, count, stride, (void *)out, (void *)data);
-
-	if (stride == 4)
-		COPY_DWORDS(out, data, count);
-	else
-		for (i = 0; i < count; i++) {
-			out[0] = *(int *)data;
-			out++;
-			data += stride;
-		}
-}
-
-static void r300EmitVec8(uint32_t *out, GLvoid * data, int stride, int count)
-{
-	int i;
-
-	if (RADEON_DEBUG & DEBUG_VERTS)
-		fprintf(stderr, "%s count %d stride %d out %p data %p\n",
-			__FUNCTION__, count, stride, (void *)out, (void *)data);
-
-	if (stride == 8)
-		COPY_DWORDS(out, data, count * 2);
-	else
-		for (i = 0; i < count; i++) {
-			out[0] = *(int *)data;
-			out[1] = *(int *)(data + 4);
-			out += 2;
-			data += stride;
-		}
-}
-
-static void r300EmitVec12(uint32_t *out, GLvoid * data, int stride, int count)
-{
-	int i;
-
-	if (RADEON_DEBUG & DEBUG_VERTS)
-		fprintf(stderr, "%s count %d stride %d out %p data %p\n",
-			__FUNCTION__, count, stride, (void *)out, (void *)data);
-
-	if (stride == 12) {
-		COPY_DWORDS(out, data, count * 3);
-    }
-	else
-		for (i = 0; i < count; i++) {
-			out[0] = *(int *)data;
-			out[1] = *(int *)(data + 4);
-			out[2] = *(int *)(data + 8);
-			out += 3;
-			data += stride;
-		}
-}
-
-static void r300EmitVec16(uint32_t *out, GLvoid * data, int stride, int count)
-{
-	int i;
-
-	if (RADEON_DEBUG & DEBUG_VERTS)
-		fprintf(stderr, "%s count %d stride %d out %p data %p\n",
-			__FUNCTION__, count, stride, (void *)out, (void *)data);
-
-	if (stride == 16)
-		COPY_DWORDS(out, data, count * 4);
-	else
-		for (i = 0; i < count; i++) {
-			out[0] = *(int *)data;
-			out[1] = *(int *)(data + 4);
-			out[2] = *(int *)(data + 8);
-			out[3] = *(int *)(data + 12);
-			out += 4;
-			data += stride;
-		}
-}
-
-static void r300EmitVec(GLcontext * ctx, struct r300_aos *aos,
-			GLvoid * data, int size, int stride, int count)
-{
-	r300ContextPtr rmesa = R300_CONTEXT(ctx);
-	uint32_t *out;
-    uint32_t bo_size;
-
-    memset(aos, 0, sizeof(struct r300_aos));
-	if (stride == 0) {
-        bo_size = size * 4;
-		count = 1;
-		aos->stride = 0;
-	} else {
-        bo_size = size * count * 4;
-		aos->stride = size;
-	}
-	aos->bo = radeon_bo_open(rmesa->radeon.radeonScreen->bom,
-                             0, bo_size, 32, RADEON_GEM_DOMAIN_GTT, 0);
-    aos->offset = 0;
-	aos->components = size;
-	aos->count = count;
-
-	radeon_bo_map(aos->bo, 1);
-	out = (uint32_t*)((char*)aos->bo->ptr + aos->offset);
-	switch (size) {
-	case 1: r300EmitVec4(out, data, stride, count); break;
-	case 2: r300EmitVec8(out, data, stride, count); break;
-	case 3: r300EmitVec12(out, data, stride, count); break;
-	case 4: r300EmitVec16(out, data, stride, count); break;
-	default:
-		assert(0);
-		break;
-	}
-	radeon_bo_unmap(aos->bo);
-}
-
 #define DW_SIZE(x) ((inputs[tab[(x)]] << R300_DST_VEC_LOC_SHIFT) |	\
 		    (attribptr[tab[(x)]]->size - 1) << R300_DATA_TYPE_0_SHIFT)
 
@@ -429,10 +294,10 @@ int r300EmitArrays(GLcontext * ctx)
 		for (ci = 0; ci < vb->AttribPtr[tab[i]]->size; ci++) {
 			swizzle[i][ci] = ci;
 		}
-		r300EmitVec(ctx, &rmesa->state.aos[i],
-				vb->AttribPtr[tab[i]]->data,
-				vb->AttribPtr[tab[i]]->size,
-				vb->AttribPtr[tab[i]]->stride, count);
+		rcommon_emit_vector(ctx, &rmesa->state.aos[i],
+				    vb->AttribPtr[tab[i]]->data,
+				    vb->AttribPtr[tab[i]]->size,
+				    vb->AttribPtr[tab[i]]->stride, count);
 	}
 
 	/* Setup INPUT_ROUTE. */
diff --git a/src/mesa/drivers/dri/r300/r300_emit.h b/src/mesa/drivers/dri/r300/r300_emit.h
index 1e7a639c00..d6df2e9edf 100644
--- a/src/mesa/drivers/dri/r300/r300_emit.h
+++ b/src/mesa/drivers/dri/r300/r300_emit.h
@@ -44,13 +44,6 @@
 #include "r300_cmdbuf.h"
 #include "radeon_reg.h"
 
-/* TODO: move these defines (and the ones from DRM) into r300_reg.h and sync up
- * with DRM */
-#define CP_PACKET2  (2 << 30)
-#define CP_PACKET0(reg, n)	(RADEON_CP_PACKET0 | ((n)<<16) | ((reg)>>2))
-#define CP_PACKET3( pkt, n )						\
-	(RADEON_CP_PACKET3 | (pkt) | ((n) << 16))
-
 static INLINE uint32_t cmdpacket0(struct radeon_screen *rscrn,
                                   int reg, int count)
 {
diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index c81393e747..ef3671eadb 100644
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -180,11 +180,11 @@ static void r300EmitElts(GLcontext * ctx, void *elts, unsigned long n_elts)
 	rmesa->state.elt_dma_bo = radeon_bo_open(rmesa->radeon.radeonScreen->bom,
                                              0, n_elts * 4, 4,
                                              RADEON_GEM_DOMAIN_GTT, 0);
-    rmesa->state.elt_dma_offset = 0;
-    radeon_bo_map(rmesa->state.elt_dma_bo, 1);
+	rmesa->state.elt_dma_offset = 0;
+	radeon_bo_map(rmesa->state.elt_dma_bo, 1);
 	out = rmesa->state.elt_dma_bo->ptr + rmesa->state.elt_dma_offset;
 	memcpy(out, elts, n_elts * 4);
-    radeon_bo_unmap(rmesa->state.elt_dma_bo);
+	radeon_bo_unmap(rmesa->state.elt_dma_bo);
 }
 
 static void r300FireEB(r300ContextPtr rmesa, int vertex_count, int type)
diff --git a/src/mesa/drivers/dri/r300/r300_swtcl.c b/src/mesa/drivers/dri/r300/r300_swtcl.c
index 03fc2107db..eb86bd3bdd 100644
--- a/src/mesa/drivers/dri/r300/r300_swtcl.c
+++ b/src/mesa/drivers/dri/r300/r300_swtcl.c
@@ -271,13 +271,13 @@ r300AllocDmaLowVerts( r300ContextPtr rmesa, int nverts, int vsize )
 	GLuint bytes = vsize * nverts;
 
 	rmesa->swtcl.bo = radeon_bo_open(rmesa->radeon.radeonScreen->bom,
-                                     0, bytes, 4, RADEON_GEM_DOMAIN_GTT, 0);
-    radeon_bo_map(rmesa->swtcl.bo, 1);
-    if (rmesa->swtcl.flush == NULL) {
-        rmesa->radeon.glCtx->Driver.NeedFlush |= FLUSH_STORED_VERTICES;
-        rmesa->swtcl.flush = flush_last_swtcl_prim;
-    }
-    return rmesa->swtcl.bo->ptr;
+					 0, bytes, 4, RADEON_GEM_DOMAIN_GTT, 0);
+	radeon_bo_map(rmesa->swtcl.bo, 1);
+	if (rmesa->swtcl.flush == NULL) {
+	  rmesa->radeon.glCtx->Driver.NeedFlush |= FLUSH_STORED_VERTICES;
+	  rmesa->swtcl.flush = flush_last_swtcl_prim;
+	}
+	return rmesa->swtcl.bo->ptr;
 }
 
 static GLuint reduced_prim[] = {
diff --git a/src/mesa/drivers/dri/r300/radeon_context.c b/src/mesa/drivers/dri/r300/radeon_context.c
index 6884967663..13a7682416 100644
--- a/src/mesa/drivers/dri/r300/radeon_context.c
+++ b/src/mesa/drivers/dri/r300/radeon_context.c
@@ -60,502 +60,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "xmlpool.h"		/* for symbolic values of enum-type options */
 #include "drirenderbuffer.h"
 
-#define DRIVER_DATE "20060815"
-
-
-/* Return various strings for glGetString().
- */
-static const GLubyte *radeonGetString(GLcontext * ctx, GLenum name)
-{
-	radeonContextPtr radeon = RADEON_CONTEXT(ctx);
-	static char buffer[128];
-
-	switch (name) {
-	case GL_VENDOR:
-		if (IS_R300_CLASS(radeon->radeonScreen))
-			return (GLubyte *) "DRI R300 Project";
-		else
-			return (GLubyte *) "Tungsten Graphics, Inc.";
-
-	case GL_RENDERER:
-	{
-		unsigned offset;
-		GLuint agp_mode = (radeon->radeonScreen->card_type==RADEON_CARD_PCI) ? 0 :
-			radeon->radeonScreen->AGPMode;
-		const char* chipname;
-
-			
-
-		if (IS_R300_CLASS(radeon->radeonScreen))
-			chipname = "R300";
-		else
-			chipname = "R200";
-
-		offset = driGetRendererString(buffer, chipname, DRIVER_DATE,
-					      agp_mode);
-
-		if (IS_R300_CLASS(radeon->radeonScreen)) {
-			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-");
-		}
-
-		if (radeon->radeonScreen->driScreen->dri2.enabled)
-			strcat(buffer, " DRI2");
-
-		return (GLubyte *) buffer;
-	}
-
-	default:
-		return NULL;
-	}
-}
-
-/* Initialize the driver's misc functions.
- */
-static void radeonInitDriverFuncs(struct dd_function_table *functions)
-{
-	functions->GetString = radeonGetString;
-}
-
-
-/**
- * Create and initialize all common fields of the context,
- * including the Mesa context itself.
- */
-GLboolean radeonInitContext(radeonContextPtr radeon,
-			    struct dd_function_table* functions,
-			    const __GLcontextModes * glVisual,
-			    __DRIcontextPrivate * driContextPriv,
-			    void *sharedContextPrivate)
-{
-	__DRIscreenPrivate *sPriv = driContextPriv->driScreenPriv;
-	radeonScreenPtr screen = (radeonScreenPtr) (sPriv->private);
-	GLcontext* ctx;
-	GLcontext* shareCtx;
-	int fthrottle_mode;
-
-	/* Fill in additional standard functions. */
-	radeonInitDriverFuncs(functions);
-
-	radeon->radeonScreen = screen;
-	/* Allocate and initialize the Mesa context */
-	if (sharedContextPrivate)
-		shareCtx = ((radeonContextPtr)sharedContextPrivate)->glCtx;
-	else
-		shareCtx = NULL;
-	radeon->glCtx = _mesa_create_context(glVisual, shareCtx,
-					    functions, (void *)radeon);
-	if (!radeon->glCtx)
-		return GL_FALSE;
-
-	ctx = radeon->glCtx;
-	driContextPriv->driverPrivate = radeon;
-
-	/* DRI fields */
-	radeon->dri.context = driContextPriv;
-	radeon->dri.screen = sPriv;
-	radeon->dri.drawable = NULL;
-	radeon->dri.readable = NULL;
-	radeon->dri.hwContext = driContextPriv->hHWContext;
-	radeon->dri.hwLock = &sPriv->pSAREA->lock;
-	radeon->dri.fd = sPriv->fd;
-	radeon->dri.drmMinor = sPriv->drm_version.minor;
-
-	radeon->sarea = (drm_radeon_sarea_t *) ((GLubyte *) sPriv->pSAREA +
-					       screen->sarea_priv_offset);
-
-	/* Setup IRQs */
-	fthrottle_mode = driQueryOptioni(&radeon->optionCache, "fthrottle_mode");
-	radeon->iw.irq_seq = -1;
-	radeon->irqsEmitted = 0;
-	radeon->do_irqs = (fthrottle_mode == DRI_CONF_FTHROTTLE_IRQS &&
-			  radeon->radeonScreen->irq);
-
-	radeon->do_usleeps = (fthrottle_mode == DRI_CONF_FTHROTTLE_USLEEPS);
-
-	if (!radeon->do_irqs)
-		fprintf(stderr,
-			"IRQ's not enabled, falling back to %s: %d %d\n",
-			radeon->do_usleeps ? "usleeps" : "busy waits",
-			fthrottle_mode, radeon->radeonScreen->irq);
-
-	(*sPriv->systemTime->getUST) (&radeon->swap_ust);
-
-	return GL_TRUE;
-}
-
-
-/**
- * Cleanup common context fields.
- * Called by r200DestroyContext/r300DestroyContext
- */
-void radeonCleanupContext(radeonContextPtr radeon)
-{
-    FILE *track;
-	struct radeon_renderbuffer *rb;
-	GLframebuffer *fb;
-    
-    fb = (void*)radeon->dri.drawable->driverPrivate;
-    rb = (void *)fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer;
-    if (rb && rb->bo) {
-        radeon_bo_unref(rb->bo);
-        rb->bo = NULL;
-    }
-    rb = (void *)fb->Attachment[BUFFER_BACK_LEFT].Renderbuffer;
-    if (rb && rb->bo) {
-        radeon_bo_unref(rb->bo);
-        rb->bo = NULL;
-    }
-    rb = (void *)fb->Attachment[BUFFER_DEPTH].Renderbuffer;
-    if (rb && rb->bo) {
-        radeon_bo_unref(rb->bo);
-        rb->bo = NULL;
-    }
-    fb = (void*)radeon->dri.readable->driverPrivate;
-    rb = (void *)fb->Attachment[BUFFER_FRONT_LEFT].Renderbuffer;
-    if (rb && rb->bo) {
-        radeon_bo_unref(rb->bo);
-        rb->bo = NULL;
-    }
-    rb = (void *)fb->Attachment[BUFFER_BACK_LEFT].Renderbuffer;
-    if (rb && rb->bo) {
-        radeon_bo_unref(rb->bo);
-        rb->bo = NULL;
-    }
-    rb = (void *)fb->Attachment[BUFFER_DEPTH].Renderbuffer;
-    if (rb && rb->bo) {
-        radeon_bo_unref(rb->bo);
-        rb->bo = NULL;
-    }
-
-	/* _mesa_destroy_context() might result in calls to functions that
-	 * depend on the DriverCtx, so don't set it to NULL before.
-	 *
-	 * radeon->glCtx->DriverCtx = NULL;
-	 */
-
-	/* free the Mesa context */
-	_mesa_destroy_context(radeon->glCtx);
-
-	if (radeon->state.scissor.pClipRects) {
-		FREE(radeon->state.scissor.pClipRects);
-		radeon->state.scissor.pClipRects = 0;
-	}
-    track = fopen("/tmp/tracklog", "w");
-    if (track) {
-        radeon_tracker_print(&radeon->radeonScreen->bom->tracker, track);
-        fclose(track);
-    }
-}
-
-static void
-radeon_make_kernel_renderbuffer_current(radeonContextPtr radeon,
-					GLframebuffer *draw)
-{
-	/* if radeon->fake */
-	struct radeon_renderbuffer *rb;
-
-	if ((rb = (void *)draw->Attachment[BUFFER_FRONT_LEFT].Renderbuffer)) {
-
-		if (!rb->bo) {
-			rb->bo = radeon_bo_open(radeon->radeonScreen->bom,
-						radeon->radeonScreen->frontOffset,
-						0,
-						0,
-						RADEON_GEM_DOMAIN_VRAM,
-						0);
-		}
-		rb->cpp = radeon->radeonScreen->cpp;
-		rb->pitch = radeon->radeonScreen->frontPitch * rb->cpp;
-	}
-	if ((rb = (void *)draw->Attachment[BUFFER_BACK_LEFT].Renderbuffer)) {
-		if (!rb->bo) {
-			rb->bo = radeon_bo_open(radeon->radeonScreen->bom,
-						radeon->radeonScreen->backOffset,
-						0,
-						0,
-						RADEON_GEM_DOMAIN_VRAM,
-						0);
-		}
-		rb->cpp = radeon->radeonScreen->cpp;
-		rb->pitch = radeon->radeonScreen->backPitch * rb->cpp;
-	}
-	if ((rb = (void *)draw->Attachment[BUFFER_DEPTH].Renderbuffer)) {
-		if (!rb->bo) {
-			rb->bo = radeon_bo_open(radeon->radeonScreen->bom,
-						radeon->radeonScreen->depthOffset,
-						0,
-						0,
-						RADEON_GEM_DOMAIN_VRAM,
-						0);
-		}
-		rb->cpp = radeon->radeonScreen->cpp;
-		rb->pitch = radeon->radeonScreen->depthPitch * rb->cpp;
-	}
-}
-
-static void
-radeon_make_renderbuffer_current(radeonContextPtr radeon,
-					GLframebuffer *draw)
-{
-	int size = 4096*4096*4;
-	/* if radeon->fake */
-	struct radeon_renderbuffer *rb;
-
-	if (radeon->radeonScreen->kernel_mm) {
-		radeon_make_kernel_renderbuffer_current(radeon, draw);
-		return;
-	}
-			
-
-	if ((rb = (void *)draw->Attachment[BUFFER_FRONT_LEFT].Renderbuffer)) {
-		if (!rb->bo) {
-			rb->bo = radeon_bo_open(radeon->radeonScreen->bom,
-						radeon->radeonScreen->frontOffset +
-						radeon->radeonScreen->fbLocation,
-						size,
-						4096,
-						RADEON_GEM_DOMAIN_VRAM,
-						0);
-		}
-		rb->cpp = radeon->radeonScreen->cpp;
-		rb->pitch = radeon->radeonScreen->frontPitch * rb->cpp;
-	}
-	if ((rb = (void *)draw->Attachment[BUFFER_BACK_LEFT].Renderbuffer)) {
-		if (!rb->bo) {
-			rb->bo = radeon_bo_open(radeon->radeonScreen->bom,
-						radeon->radeonScreen->backOffset +
-						radeon->radeonScreen->fbLocation,
-						size,
-						4096,
-						RADEON_GEM_DOMAIN_VRAM,
-						0);
-		}
-		rb->cpp = radeon->radeonScreen->cpp;
-		rb->pitch = radeon->radeonScreen->backPitch * rb->cpp;
-	}
-	if ((rb = (void *)draw->Attachment[BUFFER_DEPTH].Renderbuffer)) {
-		if (!rb->bo) {
-			rb->bo = radeon_bo_open(radeon->radeonScreen->bom,
-						radeon->radeonScreen->depthOffset +
-						radeon->radeonScreen->fbLocation,
-						size,
-						4096,
-						RADEON_GEM_DOMAIN_VRAM,
-						0);
-		}
-		rb->cpp = radeon->radeonScreen->cpp;
-		rb->pitch = radeon->radeonScreen->depthPitch * rb->cpp;
-	}
-}
-
-
-void
-radeon_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable)
-{
-    unsigned int attachments[10];
-    __DRIbuffer *buffers;
-    __DRIscreen *screen;
-	struct radeon_renderbuffer *rb;
-    int i, count;
-	GLframebuffer *draw;
-	radeonContextPtr radeon;
-
-	draw = drawable->driverPrivate;
-    screen = context->driScreenPriv;
-	radeon = (radeonContextPtr) context->driverPrivate;
-    i = 0;
-	if ((rb = (void *)draw->Attachment[BUFFER_FRONT_LEFT].Renderbuffer)) {
-        attachments[i++] = __DRI_BUFFER_FRONT_LEFT;
-    }
-	if ((rb = (void *)draw->Attachment[BUFFER_BACK_LEFT].Renderbuffer)) {
-        attachments[i++] = __DRI_BUFFER_BACK_LEFT;
-    }
-	if ((rb = (void *)draw->Attachment[BUFFER_DEPTH].Renderbuffer)) {
-        attachments[i++] = __DRI_BUFFER_DEPTH;
-    }
-
-    buffers = (*screen->dri2.loader->getBuffers)(drawable,
-                                                 &drawable->w,
-                                                 &drawable->h,
-                                                 attachments, i,
-                                                 &count,
-                                                 drawable->loaderPrivate);
-    if (buffers == NULL)
-        return;
-
-    /* set one cliprect to cover the whole drawable */
-    drawable->x = 0;
-    drawable->y = 0;
-    drawable->backX = 0;
-    drawable->backY = 0;
-    drawable->numClipRects = 1;
-    drawable->pClipRects[0].x1 = 0;
-    drawable->pClipRects[0].y1 = 0;
-    drawable->pClipRects[0].x2 = drawable->w;
-    drawable->pClipRects[0].y2 = drawable->h;
-    drawable->numBackClipRects = 1;
-    drawable->pBackClipRects[0].x1 = 0;
-    drawable->pBackClipRects[0].y1 = 0;
-    drawable->pBackClipRects[0].x2 = drawable->w;
-    drawable->pBackClipRects[0].y2 = drawable->h;
-    for (i = 0; i < count; i++) {
-        switch (buffers[i].attachment) {
-        case __DRI_BUFFER_FRONT_LEFT:
-            rb = (void *)draw->Attachment[BUFFER_FRONT_LEFT].Renderbuffer;
-            if (rb->bo) {
-                radeon_bo_unref(rb->bo);
-                rb->bo = NULL;
-            }
-            rb->cpp = buffers[i].cpp;
-            rb->pitch = buffers[i].pitch;
-            rb->width = drawable->w;
-            rb->height = drawable->h;
-            rb->has_surface = 0;
-            rb->bo = radeon_bo_open(radeon->radeonScreen->bom,
-                                    buffers[i].name,
-                                    0,
-                                    0,
-                                    RADEON_GEM_DOMAIN_VRAM,
-                                    buffers[i].flags);
-            if (rb->bo == NULL) {
-                fprintf(stderr, "failled to attach front %d\n",
-                        buffers[i].name);
-            }
-            break;
-        case __DRI_BUFFER_BACK_LEFT:
-            rb = (void *)draw->Attachment[BUFFER_BACK_LEFT].Renderbuffer;
-            if (rb->bo) {
-                radeon_bo_unref(rb->bo);
-                rb->bo = NULL;
-            }
-            rb->cpp = buffers[i].cpp;
-            rb->pitch = buffers[i].pitch;
-            rb->width = drawable->w;
-            rb->height = drawable->h;
-            rb->has_surface = 0;
-            rb->bo = radeon_bo_open(radeon->radeonScreen->bom,
-                                    buffers[i].name,
-                                    0,
-                                    0,
-                                    RADEON_GEM_DOMAIN_VRAM,
-                                    buffers[i].flags);
-            break;
-        case __DRI_BUFFER_DEPTH:
-            rb = (void *)draw->Attachment[BUFFER_DEPTH].Renderbuffer;
-            if (rb->bo) {
-                radeon_bo_unref(rb->bo);
-                rb->bo = NULL;
-            }
-            rb->cpp = buffers[i].cpp;
-            rb->pitch = buffers[i].pitch;
-            rb->width = drawable->w;
-            rb->height = drawable->h;
-            rb->has_surface = 0;
-            rb->bo = radeon_bo_open(radeon->radeonScreen->bom,
-                                    buffers[i].name,
-                                    0,
-                                    0,
-                                    RADEON_GEM_DOMAIN_VRAM,
-                                    buffers[i].flags);
-            break;
-        case __DRI_BUFFER_STENCIL:
-            break;
-        case __DRI_BUFFER_ACCUM:
-        default:
-            fprintf(stderr,
-                    "unhandled buffer attach event, attacment type %d\n",
-                    buffers[i].attachment);
-            return;
-        }
-    }
-	radeon = (radeonContextPtr) context->driverPrivate;
-	driUpdateFramebufferSize(radeon->glCtx, drawable);
-}
-
-
-/* Force the context `c' to be the current context and associate with it
- * buffer `b'.
- */
-GLboolean radeonMakeCurrent(__DRIcontextPrivate * driContextPriv,
-			    __DRIdrawablePrivate * driDrawPriv,
-			    __DRIdrawablePrivate * driReadPriv)
-{
-	radeonContextPtr radeon;
-	GLframebuffer *dfb, *rfb;
-
-	if (!driContextPriv) {
-		if (RADEON_DEBUG & DEBUG_DRI)
-			fprintf(stderr, "%s ctx is null\n", __FUNCTION__);
-		_mesa_make_current(NULL, NULL, NULL);
-		return GL_TRUE;
-	}
-	radeon = (radeonContextPtr) driContextPriv->driverPrivate;
-	dfb = driDrawPriv->driverPrivate;
-	rfb = driReadPriv->driverPrivate;
-
-	if (driContextPriv->driScreenPriv->dri2.enabled) {    
-		radeon_update_renderbuffers(driContextPriv, driDrawPriv);
-		if (driDrawPriv != driReadPriv)
-			radeon_update_renderbuffers(driContextPriv, driReadPriv);
-		radeon->state.color.rrb =
-			(void *)dfb->Attachment[BUFFER_BACK_LEFT].Renderbuffer;
-		radeon->state.depth.rrb =
-			(void *)dfb->Attachment[BUFFER_DEPTH].Renderbuffer;
-	}
-
-
-	if (RADEON_DEBUG & DEBUG_DRI)
-		fprintf(stderr, "%s ctx %p\n", __FUNCTION__, radeon->glCtx);
-
-	driUpdateFramebufferSize(radeon->glCtx, driDrawPriv);
-	if (driReadPriv != driDrawPriv)
-		driUpdateFramebufferSize(radeon->glCtx, driReadPriv);
-
-	if (!driContextPriv->driScreenPriv->dri2.enabled) {
-		radeon_make_renderbuffer_current(radeon, dfb);
-	}
-	
-	_mesa_make_current(radeon->glCtx, dfb, rfb);
-
-	if (radeon->dri.drawable != driDrawPriv) {
-		if (driDrawPriv->swap_interval == (unsigned)-1) {
-			driDrawPriv->vblFlags =
-				(radeon->radeonScreen->irq != 0)
-				? driGetDefaultVBlankFlags(&radeon->
-							   optionCache)
-					: VBLANK_FLAG_NO_IRQ;
-
-			driDrawableInitVBlank(driDrawPriv);
-		}
-	}
-
-	radeon->dri.readable = driReadPriv;
-
-	if (radeon->dri.drawable != driDrawPriv ||
-	    radeon->lastStamp != driDrawPriv->lastStamp) {
-		radeon->dri.drawable = driDrawPriv;
-
-		radeonSetCliprects(radeon);
-		r300UpdateViewportOffset(radeon->glCtx);
-	}
-
-	_mesa_update_state(radeon->glCtx);
-
-    if (!driContextPriv->driScreenPriv->dri2.enabled) {    
-	    radeonUpdatePageFlipping(radeon);
-    }
-
-	if (RADEON_DEBUG & DEBUG_DRI)
-		fprintf(stderr, "End %s\n", __FUNCTION__);
-	return GL_TRUE;
-}
-
 /* Force the context `c' to be unbound from its buffer.
  */
 GLboolean radeonUnbindContext(__DRIcontextPrivate * driContextPriv)