fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 21:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

st/mesa: Remove unused renderbuffer fields and functions.

Browse source 
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Stéphane Marchesin 2011-09-07 12:06:30 -07:00
parent 4bc5bfb641
commit c1cac8feec
2 changed files with 1 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/mesa/state_tracker/st_cb_fbo.c
View file

@ -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;
}

14
src/mesa/state_tracker/st_cb_fbo.h
View file

@ -48,7 +48,6 @@ struct st_renderbuffer
struct gl_renderbuffer Base;
struct pipe_resource *texture;
struct pipe_surface *surface; /* temporary view into texture */
struct pipe_sampler_view *sampler_view;
enum pipe_format format; /** preferred format, or PIPE_FORMAT_NONE */
GLboolean defined; /**< defined contents? */
@ -58,14 +57,9 @@ struct st_renderbuffer
boolean software;
size_t stride;
void *data;
struct st_texture_object *rtt; /**< GL render to texture's texture */
int rtt_level, rtt_face, rtt_slice;
/** Render to texture state */
struct pipe_resource *texture_save;
struct pipe_surface *surface_save;
struct pipe_sampler_view *sampler_view_save;
};
@ -82,12 +76,6 @@ st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw);
extern void
st_init_fbo_functions(struct dd_function_table *functions);
/* XXX unused ? */
extern struct pipe_sampler_view *
st_get_renderbuffer_sampler_view(struct st_renderbuffer *rb,
struct pipe_context *pipe);
extern GLboolean
st_is_depth_stencil_combined(const struct gl_renderbuffer_attachment *depth,
const struct gl_renderbuffer_attachment *stencil);