summaryrefslogtreecommitdiff
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorJakob Bornecrantz <wallbraker@gmail.com>2009-08-29 22:02:49 +0100
committerJakob Bornecrantz <wallbraker@gmail.com>2009-08-31 16:29:57 +0100
commit4224bda684aaee92d27e09c5545a7094cda0ae76 (patch)
tree03d0c1ee25cb5db8762f6becbc7a0d011eb41111 /src/gallium/drivers
parente1741dbe45ef1f43432457fab088275ecf953d17 (diff)
i915g: Cleanup texture init functions a bit
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/i915simple/i915_context.c1
-rw-r--r--src/gallium/drivers/i915simple/i915_screen.c2
-rw-r--r--src/gallium/drivers/i915simple/i915_texture.c18
-rw-r--r--src/gallium/drivers/i915simple/i915_texture.h11
4 files changed, 9 insertions, 23 deletions
diff --git a/src/gallium/drivers/i915simple/i915_context.c b/src/gallium/drivers/i915simple/i915_context.c
index 132ed31f38..b77a831ca0 100644
--- a/src/gallium/drivers/i915simple/i915_context.c
+++ b/src/gallium/drivers/i915simple/i915_context.c
@@ -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);
diff --git a/src/gallium/drivers/i915simple/i915_screen.c b/src/gallium/drivers/i915simple/i915_screen.c
index c9a9e90f0e..a7a95edaa0 100644
--- a/src/gallium/drivers/i915simple/i915_screen.c
+++ b/src/gallium/drivers/i915simple/i915_screen.c
@@ -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;
diff --git a/src/gallium/drivers/i915simple/i915_texture.c b/src/gallium/drivers/i915simple/i915_texture.c
index 0dc6a54746..975602a166 100644
--- a/src/gallium/drivers/i915simple/i915_texture.c
+++ b/src/gallium/drivers/i915simple/i915_texture.c
@@ -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,
diff --git a/src/gallium/drivers/i915simple/i915_texture.h b/src/gallium/drivers/i915simple/i915_texture.h
index 7225016a9f..51a1dd984c 100644
--- a/src/gallium/drivers/i915simple/i915_texture.h
+++ b/src/gallium/drivers/i915simple/i915_texture.h
@@ -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 */