mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r13354) -Codechange: make 8bpp_optimized blitter ~25% faster in encoding and ~15% faster in drawing (depends on architecture)

This commit is contained in:
smatz 2008-06-01 19:36:55 +00:00
parent ed462507b2
commit 0812e2f959
1 changed files with 52 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src/blitter/8bpp_optimized.cpp
View File

@ -6,38 +6,34 @@
#include "../zoom_func.h" #include "../zoom_func.h"
#include "../debug.h" #include "../debug.h"
#include "../core/alloc_func.hpp" #include "../core/alloc_func.hpp"
#include "../core/math_func.hpp"
#include "8bpp_optimized.hpp" #include "8bpp_optimized.hpp"
static FBlitter_8bppOptimized iFBlitter_8bppOptimized; static FBlitter_8bppOptimized iFBlitter_8bppOptimized;
void Blitter_8bppOptimized::Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom) void Blitter_8bppOptimized::Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom)
{ {
const uint8 *src, *src_next;
uint8 *dst, *dst_line;
uint offset = 0;
/* Find the offset of this zoom-level */ /* Find the offset of this zoom-level */
offset = ((const uint8 *)bp->sprite)[(int)(zoom - ZOOM_LVL_BEGIN) * 2] | ((const byte *)bp->sprite)[(int)(zoom - ZOOM_LVL_BEGIN) * 2 + 1] << 8; uint offset = ((const uint8 *)bp->sprite)[(int)(zoom - ZOOM_LVL_BEGIN) * 2] | ((const byte *)bp->sprite)[(int)(zoom - ZOOM_LVL_BEGIN) * 2 + 1] << 8;
/* Find where to start reading in the source sprite */ /* Find where to start reading in the source sprite */
src = (const uint8 *)bp->sprite + offset; const uint8 *src = (const uint8 *)bp->sprite + offset;
dst_line = (uint8 *)bp->dst + bp->top * bp->pitch + bp->left; uint8 *dst_line = (uint8 *)bp->dst + bp->top * bp->pitch + bp->left;
/* Skip over the top lines in the source image */ /* Skip over the top lines in the source image */
for (int y = 0; y < bp->skip_top; y++) { for (int y = 0; y < bp->skip_top; y++) {
uint trans, pixels;
for (;;) { for (;;) {
trans = *src++; uint trans = *src++;
pixels = *src++; uint pixels = *src++;
if (trans == 0 && pixels == 0) break; if (trans == 0 && pixels == 0) break;
src += pixels; src += pixels;
} }
} }
src_next = src; const uint8 *src_next = src;
for (int y = 0; y < bp->height; y++) { for (int y = 0; y < bp->height; y++) {
dst = dst_line; uint8 *dst = dst_line;
dst_line += bp->pitch; dst_line += bp->pitch;
uint skip_left = bp->skip_left; uint skip_left = bp->skip_left;
@ -45,8 +41,8 @@ void Blitter_8bppOptimized::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Z
for (;;) { for (;;) {
src = src_next; src = src_next;
uint8 trans = *src++; uint trans = *src++;
uint8 pixels = *src++; uint pixels = *src++;
src_next = src + pixels; src_next = src + pixels;
if (trans == 0 && pixels == 0) break; if (trans == 0 && pixels == 0) break;
if (width <= 0) continue; if (width <= 0) continue;
@ -75,7 +71,7 @@ void Blitter_8bppOptimized::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Z
dst += trans; dst += trans;
width -= trans; width -= trans;
if (width <= 0) continue; if (width <= 0) continue;
if (pixels > width) pixels = width; pixels = min<uint>(pixels, (uint)width);
width -= pixels; width -= pixels;
switch (mode) { switch (mode) {
@ -104,99 +100,98 @@ void Blitter_8bppOptimized::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Z
Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator) Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator)
{ {
Sprite *dest_sprite;
byte *temp_dst;
uint memory = 0;
uint index = 0;
/* Make memory for all zoom-levels */ /* Make memory for all zoom-levels */
memory += (int)(ZOOM_LVL_END - ZOOM_LVL_BEGIN) * sizeof(uint16); uint memory = (int)(ZOOM_LVL_END - ZOOM_LVL_BEGIN) * sizeof(uint16);
for (ZoomLevel i = ZOOM_LVL_BEGIN; i < ZOOM_LVL_END; i++) { for (ZoomLevel i = ZOOM_LVL_BEGIN; i < ZOOM_LVL_END; i++) {
memory += UnScaleByZoom(sprite->height, i) * UnScaleByZoom(sprite->width, i); memory += UnScaleByZoom(sprite->height, i) * UnScaleByZoom(sprite->width, i);
index += 2;
} }
/* We have no idea how much memory we really need, so just guess something */ /* We have no idea how much memory we really need, so just guess something */
memory *= 5; memory *= 5;
temp_dst = MallocT<byte>(memory); byte *temp_dst = MallocT<byte>(memory);
byte *dst = &temp_dst[(ZOOM_LVL_END - ZOOM_LVL_BEGIN) * 2];
/* Make the sprites per zoom-level */ /* Make the sprites per zoom-level */
for (ZoomLevel i = ZOOM_LVL_BEGIN; i < ZOOM_LVL_END; i++) { for (ZoomLevel i = ZOOM_LVL_BEGIN; i < ZOOM_LVL_END; i++) {
/* Store the scaled image */
const SpriteLoader::CommonPixel *src;
/* Store the index table */ /* Store the index table */
uint index = dst - temp_dst;
temp_dst[i * 2] = index & 0xFF; temp_dst[i * 2] = index & 0xFF;
temp_dst[i * 2 + 1] = (index >> 8) & 0xFF; temp_dst[i * 2 + 1] = (index >> 8) & 0xFF;
byte *dst = &temp_dst[index]; /* cache values, because compiler can't cache it */
int scaled_height = UnScaleByZoom(sprite->height, i);
int scaled_width = UnScaleByZoom(sprite->width, i);
int scaled_1 = ScaleByZoom(1, i);
for (int y = 0; y < UnScaleByZoom(sprite->height, i); y++) { for (int y = 0; y < scaled_height; y++) {
uint trans = 0; uint trans = 0;
uint pixels = 0; uint pixels = 0;
uint last_color = 0; uint last_colour = 0;
uint count_index = 0; byte *count_dst = NULL;
uint rx = 0;
src = &sprite->data[ScaleByZoom(y, i) * sprite->width];
for (int x = 0; x < UnScaleByZoom(sprite->width, i); x++) { /* Store the scaled image */
uint color = 0; const SpriteLoader::CommonPixel *src = &sprite->data[ScaleByZoom(y, i) * sprite->width];
const SpriteLoader::CommonPixel *src_end = &src[sprite->width];
for (int x = 0; x < scaled_width; x++) {
uint colour = 0;
/* Get the color keeping in mind the zoom-level */ /* Get the color keeping in mind the zoom-level */
for (int j = 0; j < ScaleByZoom(1, i); j++) { for (int j = 0; j < scaled_1; j++) {
if (src->m != 0) color = src->m; if (src->m != 0) colour = src->m;
src++;
rx++;
/* Because of the scaling it might happen we read outside the buffer. Avoid that. */ /* Because of the scaling it might happen we read outside the buffer. Avoid that. */
if (rx == sprite->width) break; if (++src == src_end) break;
} }
if (last_color == 0 || color == 0 || pixels == 255) { if (last_colour == 0 || colour == 0 || pixels == 255) {
if (count_index != 0) { if (count_dst != NULL) {
/* Write how many non-transparent bytes we get */ /* Write how many non-transparent bytes we get */
temp_dst[count_index] = pixels; *count_dst = pixels;
pixels = 0; pixels = 0;
count_index = 0; count_dst = NULL;
} }
/* As long as we find transparency bytes, keep counting */ /* As long as we find transparency bytes, keep counting */
if (color == 0) { if (colour == 0) {
last_color = 0; last_colour = 0;
trans++; trans++;
continue; continue;
} }
/* No longer transparency, so write the amount of transparent bytes */ /* No longer transparency, so write the amount of transparent bytes */
*dst = trans; *dst = trans;
dst++; index++; dst++;
trans = 0; trans = 0;
/* Reserve a byte for the pixel counter */ /* Reserve a byte for the pixel counter */
count_index = index; count_dst = dst;
dst++; index++; dst++;
} }
last_color = color; last_colour = colour;
pixels++; pixels++;
*dst = color; *dst = colour;
dst++; index++; dst++;
} }
if (count_index != 0) temp_dst[count_index] = pixels; if (count_dst != NULL) *count_dst = pixels;
/* Write line-ending */ /* Write line-ending */
*dst = 0; dst++; index++; *dst = 0; dst++;
*dst = 0; dst++; index++; *dst = 0; dst++;
} }
} }
uint size = dst - temp_dst;
/* Safety check, to make sure we guessed the size correctly */ /* Safety check, to make sure we guessed the size correctly */
assert(index < memory); assert(size < memory);
/* Allocate the exact amount of memory we need */ /* Allocate the exact amount of memory we need */
dest_sprite = (Sprite *)allocator(sizeof(*dest_sprite) + index); Sprite *dest_sprite = (Sprite *)allocator(sizeof(*dest_sprite) + size);
dest_sprite->height = sprite->height; dest_sprite->height = sprite->height;
dest_sprite->width = sprite->width; dest_sprite->width = sprite->width;
dest_sprite->x_offs = sprite->x_offs; dest_sprite->x_offs = sprite->x_offs;
dest_sprite->y_offs = sprite->y_offs; dest_sprite->y_offs = sprite->y_offs;
memcpy(dest_sprite->data, temp_dst, index); memcpy(dest_sprite->data, temp_dst, size);
free(temp_dst); free(temp_dst);
return dest_sprite; return dest_sprite;