From 23a7aebae0a742d94ffe2304357dcc1234a99155 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 8 Sep 2011 10:54:11 +0200 Subject: mesa git update 8 sep 2011 --- mesalib/src/mesa/state_tracker/st_cb_fbo.c | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'mesalib/src/mesa/state_tracker/st_cb_fbo.c') diff --git a/mesalib/src/mesa/state_tracker/st_cb_fbo.c b/mesalib/src/mesa/state_tracker/st_cb_fbo.c index 5b9e20374..d43f67ac9 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_fbo.c +++ b/mesalib/src/mesa/state_tracker/st_cb_fbo.c @@ -112,7 +112,6 @@ st_renderbuffer_alloc_storage(struct gl_context * ctx, */ pipe_surface_reference( &strb->surface, NULL ); pipe_resource_reference( &strb->texture, NULL ); - pipe_sampler_view_reference(&strb->sampler_view, NULL); /* Setup new texture template. */ @@ -165,7 +164,6 @@ st_renderbuffer_delete(struct gl_renderbuffer *rb) ASSERT(strb); pipe_surface_reference(&strb->surface, NULL); pipe_resource_reference(&strb->texture, NULL); - pipe_sampler_view_reference(&strb->sampler_view, NULL); free(strb->data); free(strb); } @@ -388,9 +386,6 @@ st_render_texture(struct gl_context *ctx, pipe_surface_reference(&strb->surface, NULL); - pipe_sampler_view_reference(&strb->sampler_view, - st_get_texture_sampler_view(stObj, pipe)); - assert(strb->rtt_level <= strb->texture->last_level); /* new surface for rendering into the texture */ @@ -650,14 +645,4 @@ void st_init_fbo_functions(struct dd_function_table *functions) functions->ReadBuffer = st_ReadBuffer; } -/* XXX unused ? */ -struct pipe_sampler_view * -st_get_renderbuffer_sampler_view(struct st_renderbuffer *rb, - struct pipe_context *pipe) -{ - if (!rb->sampler_view) { - rb->sampler_view = st_create_texture_sampler_view(pipe, rb->texture); - } - return rb->sampler_view; -} -- cgit v1.2.3