Mesa (master): r600g: cleanup r600_reset_blittable_to_compressed
Marek Olšák
mareko at kemper.freedesktop.org
Fri Oct 21 01:35:23 UTC 2011
Module: Mesa
Branch: master
Commit: 7a3bbd3d5d551ede6c8cbd2b0ac8ef005ee9e043
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7a3bbd3d5d551ede6c8cbd2b0ac8ef005ee9e043
Author: Marek Olšák <maraeo at gmail.com>
Date: Fri Oct 21 02:00:40 2011 +0200
r600g: cleanup r600_reset_blittable_to_compressed
---
src/gallium/drivers/r600/r600_blit.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c
index 6c4a664..372bfc2 100644
--- a/src/gallium/drivers/r600/r600_blit.c
+++ b/src/gallium/drivers/r600/r600_blit.c
@@ -295,11 +295,8 @@ static void r600_compressed_to_blittable(struct pipe_resource *tex,
}
static void r600_reset_blittable_to_compressed(struct pipe_resource *tex,
- unsigned level,
- struct texture_orig_info *orig)
+ struct texture_orig_info *orig)
{
- struct r600_resource_texture *rtex = (struct r600_resource_texture*)tex;
-
tex->format = orig->format;
tex->width0 = orig->width0;
tex->height0 = orig->height0;
@@ -356,10 +353,10 @@ static void r600_resource_copy_region(struct pipe_context *ctx,
src, src_level, psbox);
if (restore_orig[0])
- r600_reset_blittable_to_compressed(src, src_level, &orig_info[0]);
+ r600_reset_blittable_to_compressed(src, &orig_info[0]);
if (restore_orig[1])
- r600_reset_blittable_to_compressed(dst, dst_level, &orig_info[1]);
+ r600_reset_blittable_to_compressed(dst, &orig_info[1]);
}
void r600_init_blit_functions(struct r600_pipe_context *rctx)
More information about the mesa-commit
mailing list