From 1f0cc3faf2b6b615f55f524d0a16a0da98b9549c Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 16 Jan 2012 11:38:46 -0700 Subject: [PATCH] st/mesa: remove gl_renderbuffer::GetPointer stuff (cherry picked from commit a4a566a610778e6ab93424a38e372c3dcb7d92d3) --- src/mesa/state_tracker/st_cb_fbo.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c index be9c365cde3..aeaf0c5d802 100644 --- a/src/mesa/state_tracker/st_cb_fbo.c +++ b/src/mesa/state_tracker/st_cb_fbo.c @@ -185,23 +185,6 @@ st_renderbuffer_delete(struct gl_renderbuffer *rb) /** - * gl_renderbuffer::GetPointer() - */ -static void * -null_get_pointer(struct gl_context * ctx, struct gl_renderbuffer *rb, - GLint x, GLint y) -{ - /* By returning NULL we force all software rendering to go through - * the span routines. - */ -#if 0 - assert(0); /* Should never get called with softpipe */ -#endif - return NULL; -} - - -/** * Called via ctx->Driver.NewFramebuffer() */ static struct gl_framebuffer * @@ -223,7 +206,6 @@ st_new_renderbuffer(struct gl_context *ctx, GLuint name) _mesa_init_renderbuffer(&strb->Base, name); strb->Base.Delete = st_renderbuffer_delete; strb->Base.AllocStorage = st_renderbuffer_alloc_storage; - strb->Base.GetPointer = null_get_pointer; strb->format = PIPE_FORMAT_NONE; return &strb->Base; } @@ -307,7 +289,6 @@ st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw) /* st-specific methods */ strb->Base.Delete = st_renderbuffer_delete; strb->Base.AllocStorage = st_renderbuffer_alloc_storage; - strb->Base.GetPointer = null_get_pointer; /* surface is allocated in st_renderbuffer_alloc_storage() */ strb->surface = NULL; -- 2.11.0