i915g: Cleanup texture init functions a bit

This commit is contained in:
Jakob Bornecrantz 2009-08-29 22:02:49 +01:00
parent e1741dbe45
commit 4224bda684
4 changed files with 9 additions and 23 deletions

View File

@ -209,7 +209,6 @@ struct pipe_context *i915_create_context( struct pipe_screen *screen,
i915_init_surface_functions(i915);
i915_init_state_functions(i915);
i915_init_flush_functions(i915);
i915_init_texture_functions(i915);
draw_install_aaline_stage(i915->draw, &i915->base);
draw_install_aapoint_stage(i915->draw, &i915->base);

View File

@ -342,7 +342,7 @@ i915_create_screen(struct pipe_winsys *winsys, uint pci_id)
i915screen->base.transfer_map = i915_transfer_map;
i915screen->base.transfer_unmap = i915_transfer_unmap;
i915_init_screen_texture_functions(&i915screen->base);
i915_init_screen_texture_functions(i915screen);
u_simple_screen_init(&i915screen->base);
return &i915screen->base;

View File

@ -718,12 +718,6 @@ i915_texture_blanket(struct pipe_screen * screen,
return &tex->base;
}
void
i915_init_texture_functions(struct i915_context *i915)
{
// i915->pipe.texture_update = i915_texture_update;
}
static void
i915_tex_surface_destroy(struct pipe_surface *surf)
{
@ -732,13 +726,13 @@ i915_tex_surface_destroy(struct pipe_surface *surf)
}
void
i915_init_screen_texture_functions(struct pipe_screen *screen)
i915_init_screen_texture_functions(struct i915_screen *is)
{
screen->texture_create = i915_texture_create;
screen->texture_destroy = i915_texture_destroy;
screen->get_tex_surface = i915_get_tex_surface;
screen->texture_blanket = i915_texture_blanket;
screen->tex_surface_destroy = i915_tex_surface_destroy;
is->base.texture_create = i915_texture_create;
is->base.texture_destroy = i915_texture_destroy;
is->base.get_tex_surface = i915_get_tex_surface;
is->base.texture_blanket = i915_texture_blanket;
is->base.tex_surface_destroy = i915_tex_surface_destroy;
}
boolean i915_get_texture_buffer( struct pipe_texture *texture,

View File

@ -28,16 +28,9 @@
#ifndef I915_TEXTURE_H
#define I915_TEXTURE_H
struct i915_context;
struct pipe_screen;
struct i915_screen;
extern void
i915_init_texture_functions(struct i915_context *i915);
extern void
i915_init_screen_texture_functions(struct pipe_screen *screen);
i915_init_screen_texture_functions(struct i915_screen *is);
#endif /* I915_TEXTURE_H */