gallium: softpipe_init_texture_funcs(), make texture func static

This commit is contained in:
Brian
2008-02-27 08:58:12 -07:00
parent 8d94dabad8
commit e8c0162fa0
3 changed files with 17 additions and 25 deletions

View File

@@ -279,12 +279,7 @@ struct pipe_context *softpipe_create( struct pipe_winsys *pipe_winsys,
softpipe->pipe.flush = softpipe_flush; softpipe->pipe.flush = softpipe_flush;
softpipe_init_query_funcs( softpipe ); softpipe_init_query_funcs( softpipe );
softpipe_init_texture_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;
/* /*
* Alloc caches for accessing drawing surfaces and textures. * Alloc caches for accessing drawing surfaces and textures.

View File

@@ -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, softpipe_texture_create(struct pipe_context *pipe,
const struct pipe_texture *templat) 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) softpipe_texture_release(struct pipe_context *pipe, struct pipe_texture **pt)
{ {
if (!*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, softpipe_texture_update(struct pipe_context *pipe,
struct pipe_texture *texture) struct pipe_texture *texture)
{ {
@@ -150,7 +150,7 @@ softpipe_texture_update(struct pipe_context *pipe,
/** /**
* Called via pipe->get_tex_surface() * Called via pipe->get_tex_surface()
*/ */
struct pipe_surface * static struct pipe_surface *
softpipe_get_tex_surface(struct pipe_context *pipe, softpipe_get_tex_surface(struct pipe_context *pipe,
struct pipe_texture *pt, struct pipe_texture *pt,
unsigned face, unsigned level, unsigned zslice) unsigned face, unsigned level, unsigned zslice)
@@ -183,3 +183,14 @@ softpipe_get_tex_surface(struct pipe_context *pipe,
} }
return ps; 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;
}

View File

@@ -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 extern void
softpipe_texture_release(struct pipe_context *pipe, struct pipe_texture **pt); softpipe_init_texture_funcs( struct softpipe_context *softpipe );
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);
#endif /* SP_TEXTURE */ #endif /* SP_TEXTURE */