fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-06 10:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

comments, clean-ups, consts

Browse source
This commit is contained in:
Brian 2008-02-05 17:55:16 -07:00 • committed by Ben Skeggs
parent 35caa43e68
commit e232b3ffc1
2 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/mesa/state_tracker/st_texture.c
View file

@ -59,6 +59,10 @@ target_to_target(GLenum target)
}
#endif
/**
* Allocate a new pipe_texture object
*/
struct pipe_texture *
st_texture_create(struct st_context *st,
enum pipe_texture_target target,
@ -100,17 +104,16 @@ st_texture_create(struct st_context *st,
}
/* Can the image be pulled into a unified mipmap texture. This mirrors
* the completeness test in a lot of ways.
/**
* Check if a texture image be pulled into a unified mipmap texture.
* This mirrors the completeness test in a lot of ways.
*
* Not sure whether I want to pass gl_texture_image here.
*/
GLboolean
st_texture_match_image(struct pipe_texture *pt,
struct gl_texture_image *image,
GLuint face, GLuint level)
st_texture_match_image(const struct pipe_texture *pt,
const struct gl_texture_image *image,
GLuint face, GLuint level)
{
/* Images with borders are never pulled into mipmap textures.
*/
@ -189,6 +192,7 @@ st_texture_image_map(struct st_context *st, struct st_texture_image *stImage,
return pipe_surface_map(stImage->surface);
}
void
st_texture_image_unmap(struct st_texture_image *stImage)
{
@ -201,7 +205,8 @@ st_texture_image_unmap(struct st_texture_image *stImage)
/* Upload data to a rectangular sub-region. Lots of choices how to do this:
/**
* Upload data to a rectangular sub-region. Lots of choices how to do this:
*
* - memcpy by span to current destination
* - upload data as new buffer and blit
@ -261,13 +266,14 @@ st_texture_image_data(struct pipe_context *pipe,
}
}
/* Copy mipmap image between textures
*/
void
st_texture_image_copy(struct pipe_context *pipe,
struct pipe_texture *dst,
GLuint face, GLuint level,
struct pipe_texture *src)
struct pipe_texture *dst,
GLuint face, GLuint level,
struct pipe_texture *src)
{
GLuint width = src->width[level];
GLuint height = src->height[level];
@ -278,6 +284,7 @@ st_texture_image_copy(struct pipe_context *pipe,
if (dst->compressed)
height /= 4;
for (i = 0; i < depth; i++) {
dst_surface = pipe->get_tex_surface(pipe, dst, face, level, i);
src_surface = pipe->get_tex_surface(pipe, src, face, level, i);
@ -292,5 +299,4 @@ st_texture_image_copy(struct pipe_context *pipe,
pipe_surface_reference(&dst_surface, NULL);
pipe_surface_reference(&src_surface, NULL);
}
}

8
src/mesa/state_tracker/st_texture.h
View file

@ -47,11 +47,11 @@ st_texture_create(struct st_context *st,
GLuint compress_byte);
/* Check if an image fits an existing texture
/* Check if an image fits into an existing texture object.
*/
extern GLboolean
st_texture_match_image(struct pipe_texture *pt,
struct gl_texture_image *image,
st_texture_match_image(const struct pipe_texture *pt,
const struct gl_texture_image *image,
GLuint face, GLuint level);
/* Return a pointer to an image within a texture. Return image stride as
@ -73,7 +73,7 @@ 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:
/* 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,