From 964c5195a2195165017fb8eb9bc3e5756735cc57 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 13 Oct 2011 17:14:11 -0700 Subject: [PATCH] radeon: Remove dead swrast renderbuffer setup code. This was from the stub code in the initial commit of this file. --- src/mesa/drivers/dri/radeon/radeon_fbo.c | 49 +++++++++++++------------------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/src/mesa/drivers/dri/radeon/radeon_fbo.c b/src/mesa/drivers/dri/radeon/radeon_fbo.c index 92c1854..a98c62d 100644 --- a/src/mesa/drivers/dri/radeon/radeon_fbo.c +++ b/src/mesa/drivers/dri/radeon/radeon_fbo.c @@ -92,7 +92,7 @@ radeon_alloc_renderbuffer_storage(struct gl_context * ctx, struct gl_renderbuffe { struct radeon_context *radeon = RADEON_CONTEXT(ctx); struct radeon_renderbuffer *rrb = radeon_renderbuffer(rb); - GLboolean software_buffer = GL_FALSE; + uint32_t size, pitch; int cpp; radeon_print(RADEON_TEXTURE, RADEON_TRACE, @@ -170,34 +170,25 @@ radeon_alloc_renderbuffer_storage(struct gl_context * ctx, struct gl_renderbuffe if (rrb->bo) radeon_bo_unref(rrb->bo); - - - if (software_buffer) { - return _mesa_soft_renderbuffer_storage(ctx, rb, internalFormat, - width, height); - } - else { - uint32_t size; - uint32_t pitch = ((cpp * width + 63) & ~63) / cpp; - - if (RADEON_DEBUG & RADEON_MEMORY) - fprintf(stderr,"Allocating %d x %d radeon RBO (pitch %d)\n", width, - height, pitch); - - size = pitch * height * cpp; - rrb->pitch = pitch * cpp; - rrb->cpp = cpp; - rrb->bo = radeon_bo_open(radeon->radeonScreen->bom, - 0, - size, - 0, - RADEON_GEM_DOMAIN_VRAM, - 0); - rb->Width = width; - rb->Height = height; - return GL_TRUE; - } - + + pitch = ((cpp * width + 63) & ~63) / cpp; + + if (RADEON_DEBUG & RADEON_MEMORY) + fprintf(stderr,"Allocating %d x %d radeon RBO (pitch %d)\n", width, + height, pitch); + + size = pitch * height * cpp; + rrb->pitch = pitch * cpp; + rrb->cpp = cpp; + rrb->bo = radeon_bo_open(radeon->radeonScreen->bom, + 0, + size, + 0, + RADEON_GEM_DOMAIN_VRAM, + 0); + rb->Width = width; + rb->Height = height; + return GL_TRUE; } #if FEATURE_OES_EGL_image -- 2.7.4