summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorBrian <brian@i915.localnet.net>2008-02-27 08:58:12 -0700
committerBrian <brian@i915.localnet.net>2008-02-27 08:58:12 -0700
commite8c0162fa0c4720aea612a617cbd02b83590763c (patch)
tree716a0336e23e611f30497901d3371a470c916790 /src/gallium
parent8d94dabad8400cf65363d107a0605a013b542fd1 (diff)
gallium: softpipe_init_texture_funcs(), make texture func static
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/softpipe/sp_context.c7
-rw-r--r--src/gallium/drivers/softpipe/sp_texture.c19
-rw-r--r--src/gallium/drivers/softpipe/sp_texture.h16
3 files changed, 17 insertions, 25 deletions
diff --git a/src/gallium/drivers/softpipe/sp_context.c b/src/gallium/drivers/softpipe/sp_context.c
index 6a884327e0..78acf51433 100644
--- a/src/gallium/drivers/softpipe/sp_context.c
+++ b/src/gallium/drivers/softpipe/sp_context.c
@@ -279,12 +279,7 @@ struct pipe_context *softpipe_create( struct pipe_winsys *pipe_winsys,
softpipe->pipe.flush = softpipe_flush;
softpipe_init_query_funcs( softpipe );
-
- /* textures */
- softpipe->pipe.texture_create = softpipe_texture_create;
- softpipe->pipe.texture_release = softpipe_texture_release;
- softpipe->pipe.texture_update = softpipe_texture_update;
- softpipe->pipe.get_tex_surface = softpipe_get_tex_surface;
+ softpipe_init_texture_funcs( softpipe );
/*
* Alloc caches for accessing drawing surfaces and textures.
diff --git a/src/gallium/drivers/softpipe/sp_texture.c b/src/gallium/drivers/softpipe/sp_texture.c
index a96447fa7a..1594521961 100644
--- a/src/gallium/drivers/softpipe/sp_texture.c
+++ b/src/gallium/drivers/softpipe/sp_texture.c
@@ -80,7 +80,7 @@ softpipe_texture_layout(struct softpipe_texture * spt)
}
-struct pipe_texture *
+static struct pipe_texture *
softpipe_texture_create(struct pipe_context *pipe,
const struct pipe_texture *templat)
{
@@ -108,7 +108,7 @@ softpipe_texture_create(struct pipe_context *pipe,
}
-void
+static void
softpipe_texture_release(struct pipe_context *pipe, struct pipe_texture **pt)
{
if (!*pt)
@@ -133,7 +133,7 @@ softpipe_texture_release(struct pipe_context *pipe, struct pipe_texture **pt)
}
-void
+static void
softpipe_texture_update(struct pipe_context *pipe,
struct pipe_texture *texture)
{
@@ -150,7 +150,7 @@ softpipe_texture_update(struct pipe_context *pipe,
/**
* Called via pipe->get_tex_surface()
*/
-struct pipe_surface *
+static struct pipe_surface *
softpipe_get_tex_surface(struct pipe_context *pipe,
struct pipe_texture *pt,
unsigned face, unsigned level, unsigned zslice)
@@ -183,3 +183,14 @@ softpipe_get_tex_surface(struct pipe_context *pipe,
}
return ps;
}
+
+
+
+void
+softpipe_init_texture_funcs( struct softpipe_context *softpipe )
+{
+ softpipe->pipe.texture_create = softpipe_texture_create;
+ softpipe->pipe.texture_release = softpipe_texture_release;
+ softpipe->pipe.texture_update = softpipe_texture_update;
+ softpipe->pipe.get_tex_surface = softpipe_get_tex_surface;
+}
diff --git a/src/gallium/drivers/softpipe/sp_texture.h b/src/gallium/drivers/softpipe/sp_texture.h
index 50fc100427..01b1e28ec5 100644
--- a/src/gallium/drivers/softpipe/sp_texture.h
+++ b/src/gallium/drivers/softpipe/sp_texture.h
@@ -54,22 +54,8 @@ softpipe_texture(struct pipe_texture *pt)
}
-
-extern struct pipe_texture *
-softpipe_texture_create(struct pipe_context *pipe,
- const struct pipe_texture *templat);
-
extern void
-softpipe_texture_release(struct pipe_context *pipe, struct pipe_texture **pt);
-
-extern void
-softpipe_texture_update(struct pipe_context *pipe,
- struct pipe_texture *texture);
-
-extern struct pipe_surface *
-softpipe_get_tex_surface(struct pipe_context *pipe,
- struct pipe_texture *pt,
- unsigned face, unsigned level, unsigned zslice);
+softpipe_init_texture_funcs( struct softpipe_context *softpipe );
#endif /* SP_TEXTURE */