diff options
author | Brian Paul <brianp@vmware.com> | 2009-11-17 21:55:48 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-11-17 22:28:50 -0700 |
commit | 2f4411c983760849f005c59f900184f01bfc0c80 (patch) | |
tree | 5c660a63cf7c09dff930d7013d7c7e3366d9ee73 | |
parent | 256527f5d95fffc75d773b8d49fa8adc56a50311 (diff) |
st/mesa: remove unused functions
-rw-r--r-- | src/mesa/state_tracker/st_texture.c | 54 | ||||
-rw-r--r-- | src/mesa/state_tracker/st_texture.h | 19 |
2 files changed, 0 insertions, 73 deletions
diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c index 1e9e4d84f8..1f36a500d3 100644 --- a/src/mesa/state_tracker/st_texture.c +++ b/src/mesa/state_tracker/st_texture.c @@ -48,24 +48,6 @@ #define DBG if(0) printf -#if 0 -static GLenum -target_to_target(GLenum target) -{ - switch (target) { - case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB: - case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB: - case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB: - case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB: - case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB: - case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB: - return GL_TEXTURE_CUBE_MAP_ARB; - default: - return target; - } -} -#endif - /** * Allocate a new pipe_texture object @@ -144,42 +126,6 @@ st_texture_match_image(const struct pipe_texture *pt, } -#if 000 -/* Although we use the image_offset[] array to store relative offsets - * to cube faces, Mesa doesn't know anything about this and expects - * each cube face to be treated as a separate image. - * - * These functions present that view to mesa: - */ -const GLuint * -st_texture_depth_offsets(struct pipe_texture *pt, GLuint level) -{ - static const GLuint zero = 0; - - if (pt->target != PIPE_TEXTURE_3D || pt->level[level].nr_images == 1) - return &zero; - else - return pt->level[level].image_offset; -} - - -/** - * Return the offset to the given mipmap texture image within the - * texture memory buffer, in bytes. - */ -GLuint -st_texture_image_offset(const struct pipe_texture * pt, - GLuint face, GLuint level) -{ - if (pt->target == PIPE_TEXTURE_CUBE) - return (pt->level[level].level_offset + - pt->level[level].image_offset[face] * pt->cpp); - else - return pt->level[level].level_offset; -} -#endif - - /** * Map one teximage in a texture object. When mapped, the image's contents * can be read/written. diff --git a/src/mesa/state_tracker/st_texture.h b/src/mesa/state_tracker/st_texture.h index 914cb1be55..afc98dd5d1 100644 --- a/src/mesa/state_tracker/st_texture.h +++ b/src/mesa/state_tracker/st_texture.h @@ -140,25 +140,6 @@ st_texture_image_unmap(struct st_context *st, struct st_texture_image *stImage); -/* Return pointers to each 2d slice within an image. Indexed by depth - * value. - */ -extern const GLuint * -st_texture_depth_offsets(struct pipe_texture *pt, GLuint level); - - -/* Return the linear offset of an image relative to the start of its region. - */ -extern GLuint -st_texture_image_offset(const struct pipe_texture *pt, - GLuint face, GLuint level); - -extern GLuint -st_texture_texel_offset(const struct pipe_texture * pt, - GLuint face, GLuint level, - GLuint col, GLuint row, GLuint img); - - /* Upload an image into a texture */ extern void |