From 26b22b5f31ac1adfecb6f487d3dfc1bab0d8c0a8 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 5 Sep 2004 23:20:04 +0000 Subject: [PATCH] simplify --- stepmania/src/RageSurfaceUtils.cpp | 34 ++++-------------------------- 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/stepmania/src/RageSurfaceUtils.cpp b/stepmania/src/RageSurfaceUtils.cpp index cacdd87d19..b521fd4c0f 100644 --- a/stepmania/src/RageSurfaceUtils.cpp +++ b/stepmania/src/RageSurfaceUtils.cpp @@ -528,36 +528,10 @@ static bool blit_rgba_to_rgba( const RageSurface *src_surf, const RageSurface *d RageSurfaceUtils::GetBitsPerChannel(src_surf->format, src_bits); RageSurfaceUtils::GetBitsPerChannel(dst_surf->format, dst_bits); - /* XXX: We should store the shifts and masks as an array in RageSurfaceFormat. */ - const int src_shifts[4] = { - src_surf->format->Rshift, - src_surf->format->Gshift, - src_surf->format->Bshift, - src_surf->format->Ashift, - }; - - const int dst_shifts[4] = { - dst_surf->format->Rshift, - dst_surf->format->Gshift, - dst_surf->format->Bshift, - dst_surf->format->Ashift, - }; - - const uint32_t src_masks[4] = - { - src_surf->format->Rmask, - src_surf->format->Gmask, - src_surf->format->Bmask, - src_surf->format->Amask - }; - - const uint32_t dst_masks[4] = - { - dst_surf->format->Rmask, - dst_surf->format->Gmask, - dst_surf->format->Bmask, - dst_surf->format->Amask - }; + const uint32_t *src_shifts = src_surf->format->Shift; + const uint32_t *dst_shifts = dst_surf->format->Shift; + const uint32_t *src_masks = src_surf->format->Mask; + const uint32_t *dst_masks = dst_surf->format->Mask; uint8_t lookup[4][256]; for( int c = 0; c < 4; ++c )