summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-09-27 16:31:13 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-09-27 16:31:13 -0600
commit28b315dc1aed36bebadfacbd55e481e7baacfcb5 (patch)
tree5eabc10d7df40921a04a74f6d28da0c3d8c8cc92
parente0271e16da6427436ed755f170e9b402ada5dd7c (diff)
comments
-rw-r--r--src/mesa/state_tracker/st_cb_texture.c7
-rw-r--r--src/mesa/state_tracker/st_mipmap_tree.c6
2 files changed, 7 insertions, 6 deletions
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index e7be3df722..eea47b9b41 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -1414,9 +1414,10 @@ copy_image_data_to_tree(struct pipe_context *pipe,
/* Copy potentially with the blitter:
*/
st_miptree_image_copy(pipe,
- stObj->mt,
- stImage->face,
- stImage->level, stImage->mt);
+ stObj->mt, /* dest miptree */
+ stImage->face, stImage->level,
+ stImage->mt /* src miptree */
+ );
st_miptree_release(pipe, &stImage->mt);
}
diff --git a/src/mesa/state_tracker/st_mipmap_tree.c b/src/mesa/state_tracker/st_mipmap_tree.c
index 1764bc61f3..27bbf17608 100644
--- a/src/mesa/state_tracker/st_mipmap_tree.c
+++ b/src/mesa/state_tracker/st_mipmap_tree.c
@@ -309,10 +309,10 @@ st_miptree_image_copy(struct pipe_context *pipe,
for (i = 0; i < depth; i++) {
pipe->region_copy(pipe,
dst->region, dst_offset + dst_depth_offset[i],
- 0,
- 0,
+ 0, 0, /* destX, Y */
src->region, src_offset + src_depth_offset[i],
- 0, 0, width, height);
+ 0, 0, /* srcX, Y */
+ width, height);
}
}