summaryrefslogtreecommitdiff
path: root/src/mesa/main/mipmap.c
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-05-18 10:36:50 -0600
committerBrian Paul <brianp@vmware.com>2009-05-18 10:36:50 -0600
commitedfbf7dccb1d90ebedfa08fe06e1db7fff9f94d4 (patch)
tree0e224de2fac2fc5c632b2398a372b658c66a36d7 /src/mesa/main/mipmap.c
parent27206add2738f9813d1e9f42fe3b1bdfbd9b8aa4 (diff)
parent7ce105d2e6885eeac73c59dc14c4cd59a89c1425 (diff)
Merge branch 'mesa_7_5_branch'
Conflicts: Makefile src/mesa/main/version.h
Diffstat (limited to 'src/mesa/main/mipmap.c')
-rw-r--r--src/mesa/main/mipmap.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 47db2acdf0..872982fa43 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -1370,6 +1370,9 @@ make_2d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
/**
* Down-sample a texture image to produce the next lower mipmap level.
+ * \param comps components per texel (1, 2, 3 or 4)
+ * \param srcRowStride stride between source rows, in texels
+ * \param dstRowStride stride between destination rows, in texels
*/
void
_mesa_generate_mipmap_level(GLenum target,