summaryrefslogtreecommitdiff
path: root/src/mesa/state_tracker/st_texture.c
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-03-18 09:40:37 -0600
committerBrian Paul <brianp@vmware.com>2009-03-18 10:24:19 -0600
commit3151f5d75ac26d4460b6905ecad0a8ac0470e419 (patch)
treeb6808e926cf7a35d8035e7cda994e6413becd3b3 /src/mesa/state_tracker/st_texture.c
parent87bcb328c109af1e1dbf224e6cf9ab0c6de7feb0 (diff)
st: update texture comments
Diffstat (limited to 'src/mesa/state_tracker/st_texture.c')
-rw-r--r--src/mesa/state_tracker/st_texture.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/mesa/state_tracker/st_texture.c b/src/mesa/state_tracker/st_texture.c
index b9b5baed14..6f274d6d69 100644
--- a/src/mesa/state_tracker/st_texture.c
+++ b/src/mesa/state_tracker/st_texture.c
@@ -114,10 +114,7 @@ st_texture_create(struct st_context *st,
/**
- * 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.
+ * Check if a texture image can be pulled into a unified mipmap texture.
*/
GLboolean
st_texture_match_image(const struct pipe_texture *pt,
@@ -129,13 +126,14 @@ st_texture_match_image(const struct pipe_texture *pt,
if (image->Border)
return GL_FALSE;
+ /* Check if this image's format matches the established texture's format.
+ */
if (st_mesa_format_to_pipe_format(image->TexFormat->MesaFormat) != pt->format ||
image->IsCompressed != pt->compressed)
return GL_FALSE;
- /* Test image dimensions against the base level image adjusted for
- * minification. This will also catch images not present in the
- * texture, changed targets, etc.
+ /* Test if this image's size matches what's expected in the
+ * established texture.
*/
if (image->Width != pt->width[level] ||
image->Height != pt->height[level] ||