author | Tero Marttila <terom@fixme.fi> |
Fri, 18 Jul 2008 21:59:53 +0300 | |
changeset 11176 | 874f8008e6e5 |
parent 11083 | 19aff1f3244e |
permissions | -rw-r--r-- |
8587
6db234b2b897
(svn r11652) -Codechange: add the svn $ header for several files
smatz
parents:
8049
diff
changeset
|
1 |
/* $Id$ */ |
6db234b2b897
(svn r11652) -Codechange: add the svn $ header for several files
smatz
parents:
8049
diff
changeset
|
2 |
|
10429
1b99254f9607
(svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description.
rubidium
parents:
8760
diff
changeset
|
3 |
/** @file 32bpp_optimized.cpp Implementation of the optimized 32 bpp blitter. */ |
1b99254f9607
(svn r12971) -Documentation: add @file in files that missed them and add something more than whitespace as description of files that don't have a description.
rubidium
parents:
8760
diff
changeset
|
4 |
|
8049
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
5 |
#include "../stdafx.h" |
8619
c2434269c3eb
(svn r11684) -Codechange: split gfx.h in a type and functional header.
rubidium
parents:
8587
diff
changeset
|
6 |
#include "../zoom_func.h" |
c2434269c3eb
(svn r11684) -Codechange: split gfx.h in a type and functional header.
rubidium
parents:
8587
diff
changeset
|
7 |
#include "../gfx_func.h" |
8049
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
8 |
#include "../debug.h" |
11082
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
9 |
#include "../core/math_func.hpp" |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
10 |
#include "../core/alloc_func.hpp" |
8049
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
11 |
#include "32bpp_optimized.hpp" |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
12 |
|
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
13 |
static FBlitter_32bppOptimized iFBlitter_32bppOptimized; |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
14 |
|
11082
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
15 |
/** |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
16 |
* Draws a sprite to a (screen) buffer. It is templated to allow faster operation. |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
17 |
* |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
18 |
* @param mode blitter mode |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
19 |
* @param bp further blitting parameters |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
20 |
* @param zoom zoom level at which we are drawing |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
21 |
*/ |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
22 |
template <BlitterMode mode> |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
23 |
inline void Blitter_32bppOptimized::Draw(const Blitter::BlitterParams *bp, ZoomLevel zoom) |
8049
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
24 |
{ |
11082
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
25 |
const SpriteData *src = (const SpriteData *)bp->sprite; |
8049
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
26 |
|
11082
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
27 |
/* src_px : each line begins with uint32 n = 'number of bytes in this line', |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
28 |
* then n times is the Colour struct for this line */ |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
29 |
const Colour *src_px = (const Colour *)(src->data + src->offset[zoom][0]); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
30 |
/* src_n : each line begins with uint32 n = 'number of bytes in this line', |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
31 |
* then interleaved stream of 'm' and 'n' channels. 'm' is remap, |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
32 |
* 'n' is number of bytes with the same alpha channel class */ |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
33 |
const uint8 *src_n = (const uint8 *)(src->data + src->offset[zoom][1]); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
34 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
35 |
/* skip upper lines in src_px and src_n */ |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
36 |
for (uint i = bp->skip_top; i != 0; i--) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
37 |
src_px = (const Colour *)((const byte *)src_px + *(const uint32 *)src_px); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
38 |
src_n += *(uint32 *)src_n; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
39 |
} |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
40 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
41 |
/* skip lines in dst */ |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
42 |
uint32 *dst = (uint32 *)bp->dst + bp->top * bp->pitch + bp->left; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
43 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
44 |
/* store so we don't have to access it via bp everytime (compiler assumes pointer aliasing) */ |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
45 |
const byte *remap = bp->remap; |
8049
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
46 |
|
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
47 |
for (int y = 0; y < bp->height; y++) { |
11082
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
48 |
/* next dst line begins here */ |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
49 |
uint32 *dst_ln = dst + bp->pitch; |
8049
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
50 |
|
11082
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
51 |
/* next src line begins here */ |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
52 |
const Colour *src_px_ln = (const Colour *)((const byte *)src_px + *(const uint32 *)src_px); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
53 |
src_px++; |
8049
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
54 |
|
11082
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
55 |
/* next src_n line begins here */ |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
56 |
const uint8 *src_n_ln = src_n + *(uint32 *)src_n; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
57 |
src_n += 4; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
58 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
59 |
/* we will end this line when we reach this point */ |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
60 |
uint32 *dst_end = dst + bp->skip_left; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
61 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
62 |
/* number of pixels with the same aplha channel class */ |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
63 |
uint n; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
64 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
65 |
while (dst < dst_end) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
66 |
n = *src_n++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
67 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
68 |
if (src_px->a == 0) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
69 |
dst += n; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
70 |
src_px ++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
71 |
src_n++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
72 |
} else { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
73 |
if (dst + n > dst_end) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
74 |
uint d = dst_end - dst; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
75 |
src_px += d; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
76 |
src_n += d; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
77 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
78 |
dst = dst_end - bp->skip_left; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
79 |
dst_end = dst + bp->width; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
80 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
81 |
n = min<uint>(n - d, (uint)bp->width); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
82 |
goto draw; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
83 |
} |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
84 |
dst += n; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
85 |
src_px += n; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
86 |
src_n += n; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
87 |
} |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
88 |
} |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
89 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
90 |
dst -= bp->skip_left; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
91 |
dst_end -= bp->skip_left; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
92 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
93 |
dst_end += bp->width; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
94 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
95 |
while (dst < dst_end) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
96 |
n = min<uint>(*src_n++, (uint)(dst_end - dst)); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
97 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
98 |
if (src_px->a == 0) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
99 |
dst += n; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
100 |
src_px++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
101 |
src_n++; |
8049
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
102 |
continue; |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
103 |
} |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
104 |
|
11082
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
105 |
draw:; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
106 |
|
8049
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
107 |
switch (mode) { |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
108 |
case BM_COLOUR_REMAP: |
11082
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
109 |
if (src_px->a == 255) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
110 |
do { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
111 |
uint m = *src_n; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
112 |
/* In case the m-channel is zero, do not remap this pixel in any way */ |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
113 |
if (m == 0) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
114 |
*dst = *src_px; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
115 |
} else { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
116 |
uint r = remap[m]; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
117 |
if (r != 0) *dst = this->LookupColourInPalette(r); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
118 |
} |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
119 |
dst++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
120 |
src_px++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
121 |
src_n++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
122 |
} while (--n != 0); |
8049
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
123 |
} else { |
11082
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
124 |
do { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
125 |
uint m = *src_n; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
126 |
if (m == 0) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
127 |
*dst = ComposeColourRGBANoCheck(src_px->r, src_px->g, src_px->b, src_px->a, *dst); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
128 |
} else { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
129 |
uint r = remap[m]; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
130 |
if (r != 0) *dst = ComposeColourPANoCheck(this->LookupColourInPalette(r), src_px->a, *dst); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
131 |
} |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
132 |
dst++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
133 |
src_px++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
134 |
src_n++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
135 |
} while (--n != 0); |
8049
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
136 |
} |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
137 |
break; |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
138 |
|
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
139 |
case BM_TRANSPARENT: |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
140 |
/* TODO -- We make an assumption here that the remap in fact is transparency, not some color. |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
141 |
* This is never a problem with the code we produce, but newgrfs can make it fail... or at least: |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
142 |
* we produce a result the newgrf maker didn't expect ;) */ |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
143 |
|
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
144 |
/* Make the current color a bit more black, so it looks like this image is transparent */ |
11082
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
145 |
src_n += n; |
11083
19aff1f3244e
(svn r13640) -Codechange: make colours behind not fully solid objects less darker for BM_TRANSPARENT (for 32bpp blitters)
smatz
parents:
11082
diff
changeset
|
146 |
if (src_px->a == 255) { |
19aff1f3244e
(svn r13640) -Codechange: make colours behind not fully solid objects less darker for BM_TRANSPARENT (for 32bpp blitters)
smatz
parents:
11082
diff
changeset
|
147 |
src_px += n; |
19aff1f3244e
(svn r13640) -Codechange: make colours behind not fully solid objects less darker for BM_TRANSPARENT (for 32bpp blitters)
smatz
parents:
11082
diff
changeset
|
148 |
do { |
19aff1f3244e
(svn r13640) -Codechange: make colours behind not fully solid objects less darker for BM_TRANSPARENT (for 32bpp blitters)
smatz
parents:
11082
diff
changeset
|
149 |
*dst = MakeTransparent(*dst, 3, 4); |
19aff1f3244e
(svn r13640) -Codechange: make colours behind not fully solid objects less darker for BM_TRANSPARENT (for 32bpp blitters)
smatz
parents:
11082
diff
changeset
|
150 |
dst++; |
19aff1f3244e
(svn r13640) -Codechange: make colours behind not fully solid objects less darker for BM_TRANSPARENT (for 32bpp blitters)
smatz
parents:
11082
diff
changeset
|
151 |
} while (--n != 0); |
19aff1f3244e
(svn r13640) -Codechange: make colours behind not fully solid objects less darker for BM_TRANSPARENT (for 32bpp blitters)
smatz
parents:
11082
diff
changeset
|
152 |
} else { |
19aff1f3244e
(svn r13640) -Codechange: make colours behind not fully solid objects less darker for BM_TRANSPARENT (for 32bpp blitters)
smatz
parents:
11082
diff
changeset
|
153 |
do { |
19aff1f3244e
(svn r13640) -Codechange: make colours behind not fully solid objects less darker for BM_TRANSPARENT (for 32bpp blitters)
smatz
parents:
11082
diff
changeset
|
154 |
*dst = MakeTransparent(*dst, (256 * 4 - src_px->a), 256 * 4); |
19aff1f3244e
(svn r13640) -Codechange: make colours behind not fully solid objects less darker for BM_TRANSPARENT (for 32bpp blitters)
smatz
parents:
11082
diff
changeset
|
155 |
dst++; |
19aff1f3244e
(svn r13640) -Codechange: make colours behind not fully solid objects less darker for BM_TRANSPARENT (for 32bpp blitters)
smatz
parents:
11082
diff
changeset
|
156 |
src_px++; |
19aff1f3244e
(svn r13640) -Codechange: make colours behind not fully solid objects less darker for BM_TRANSPARENT (for 32bpp blitters)
smatz
parents:
11082
diff
changeset
|
157 |
} while (--n != 0); |
19aff1f3244e
(svn r13640) -Codechange: make colours behind not fully solid objects less darker for BM_TRANSPARENT (for 32bpp blitters)
smatz
parents:
11082
diff
changeset
|
158 |
} |
8049
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
159 |
break; |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
160 |
|
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
161 |
default: |
11082
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
162 |
if (src_px->a == 255) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
163 |
/* faster than memcpy(), n is usually low */ |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
164 |
src_n += n; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
165 |
do { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
166 |
*dst++ = *src_px++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
167 |
} while (--n != 0); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
168 |
} else { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
169 |
src_n += n; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
170 |
do { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
171 |
*dst = ComposeColourRGBANoCheck(src_px->r, src_px->g, src_px->b, src_px->a, *dst); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
172 |
dst++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
173 |
src_px++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
174 |
} while (--n != 0); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
175 |
} |
8049
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
176 |
break; |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
177 |
} |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
178 |
} |
11082
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
179 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
180 |
dst = dst_ln; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
181 |
src_px = src_px_ln; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
182 |
src_n = src_n_ln; |
8049
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
183 |
} |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
184 |
} |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
185 |
|
11082
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
186 |
/** |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
187 |
* Draws a sprite to a (screen) buffer. Calls adequate templated function. |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
188 |
* |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
189 |
* @param bp further blitting parameters |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
190 |
* @param mode blitter mode |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
191 |
* @param zoom zoom level at which we are drawing |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
192 |
*/ |
10894
1389262b0c9e
(svn r13445) -Codechange: make 32bpp_optimized blitter ~10-20% faster in drawing (depends on architecture and compiler)
smatz
parents:
10429
diff
changeset
|
193 |
void Blitter_32bppOptimized::Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom) |
1389262b0c9e
(svn r13445) -Codechange: make 32bpp_optimized blitter ~10-20% faster in drawing (depends on architecture and compiler)
smatz
parents:
10429
diff
changeset
|
194 |
{ |
1389262b0c9e
(svn r13445) -Codechange: make 32bpp_optimized blitter ~10-20% faster in drawing (depends on architecture and compiler)
smatz
parents:
10429
diff
changeset
|
195 |
switch (mode) { |
1389262b0c9e
(svn r13445) -Codechange: make 32bpp_optimized blitter ~10-20% faster in drawing (depends on architecture and compiler)
smatz
parents:
10429
diff
changeset
|
196 |
default: NOT_REACHED(); |
1389262b0c9e
(svn r13445) -Codechange: make 32bpp_optimized blitter ~10-20% faster in drawing (depends on architecture and compiler)
smatz
parents:
10429
diff
changeset
|
197 |
case BM_NORMAL: Draw<BM_NORMAL> (bp, zoom); return; |
1389262b0c9e
(svn r13445) -Codechange: make 32bpp_optimized blitter ~10-20% faster in drawing (depends on architecture and compiler)
smatz
parents:
10429
diff
changeset
|
198 |
case BM_COLOUR_REMAP: Draw<BM_COLOUR_REMAP>(bp, zoom); return; |
1389262b0c9e
(svn r13445) -Codechange: make 32bpp_optimized blitter ~10-20% faster in drawing (depends on architecture and compiler)
smatz
parents:
10429
diff
changeset
|
199 |
case BM_TRANSPARENT: Draw<BM_TRANSPARENT> (bp, zoom); return; |
1389262b0c9e
(svn r13445) -Codechange: make 32bpp_optimized blitter ~10-20% faster in drawing (depends on architecture and compiler)
smatz
parents:
10429
diff
changeset
|
200 |
} |
1389262b0c9e
(svn r13445) -Codechange: make 32bpp_optimized blitter ~10-20% faster in drawing (depends on architecture and compiler)
smatz
parents:
10429
diff
changeset
|
201 |
} |
1389262b0c9e
(svn r13445) -Codechange: make 32bpp_optimized blitter ~10-20% faster in drawing (depends on architecture and compiler)
smatz
parents:
10429
diff
changeset
|
202 |
|
11082
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
203 |
/** |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
204 |
* Resizes the sprite in a very simple way, takes every n-th pixel and every n-th row |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
205 |
* |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
206 |
* @param sprite_src sprite to resize |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
207 |
* @param zoom resizing scale |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
208 |
* @return resized sprite |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
209 |
*/ |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
210 |
static const SpriteLoader::Sprite *ResizeSprite(const SpriteLoader::Sprite *sprite_src, ZoomLevel zoom) |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
211 |
{ |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
212 |
SpriteLoader::Sprite *sprite = MallocT<SpriteLoader::Sprite>(1); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
213 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
214 |
if (zoom == ZOOM_LVL_NORMAL) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
215 |
memcpy(sprite, sprite_src, sizeof(*sprite)); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
216 |
uint size = sprite_src->height * sprite_src->width; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
217 |
sprite->data = MallocT<SpriteLoader::CommonPixel>(size); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
218 |
memcpy(sprite->data, sprite_src->data, size * sizeof(SpriteLoader::CommonPixel)); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
219 |
return sprite; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
220 |
} |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
221 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
222 |
sprite->height = UnScaleByZoom(sprite_src->height, zoom); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
223 |
sprite->width = UnScaleByZoom(sprite_src->width, zoom); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
224 |
sprite->x_offs = UnScaleByZoom(sprite_src->x_offs, zoom); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
225 |
sprite->y_offs = UnScaleByZoom(sprite_src->y_offs, zoom); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
226 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
227 |
uint size = sprite->height * sprite->width; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
228 |
SpriteLoader::CommonPixel *dst = sprite->data = CallocT<SpriteLoader::CommonPixel>(size); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
229 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
230 |
const SpriteLoader::CommonPixel *src = (SpriteLoader::CommonPixel *)sprite_src->data; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
231 |
const SpriteLoader::CommonPixel *src_end = src + sprite_src->height * sprite_src->width; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
232 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
233 |
uint scaled_1 = ScaleByZoom(1, zoom); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
234 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
235 |
for (uint y = 0; y < sprite->height; y++) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
236 |
if (src >= src_end) src = src_end - sprite_src->width; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
237 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
238 |
const SpriteLoader::CommonPixel *src_ln = src + sprite_src->width * scaled_1; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
239 |
for (uint x = 0; x < sprite->width; x++) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
240 |
if (src >= src_ln) src = src_ln - 1; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
241 |
*dst = *src; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
242 |
dst++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
243 |
src += scaled_1; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
244 |
} |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
245 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
246 |
src = src_ln; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
247 |
} |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
248 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
249 |
return sprite; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
250 |
} |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
251 |
|
8049
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
252 |
Sprite *Blitter_32bppOptimized::Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator) |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
253 |
{ |
11082
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
254 |
/* streams of pixels (a, r, g, b channels) |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
255 |
* |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
256 |
* stored in separated stream so data are always aligned on 4B boundary */ |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
257 |
Colour *dst_px_orig[ZOOM_LVL_COUNT]; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
258 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
259 |
/* interleaved stream of 'm' channel and 'n' channel |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
260 |
* 'n' is number if following pixels with the same alpha channel class |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
261 |
* there are 3 classes: 0, 255, others |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
262 |
* |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
263 |
* it has to be stored in one stream so fewer registers are used - |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
264 |
* x86 has problems with register allocation even with this solution */ |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
265 |
uint8 *dst_n_orig[ZOOM_LVL_COUNT]; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
266 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
267 |
/* lengths of streams */ |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
268 |
uint32 lengths[ZOOM_LVL_COUNT][2]; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
269 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
270 |
for (ZoomLevel z = ZOOM_LVL_BEGIN; z < ZOOM_LVL_END; z++) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
271 |
const SpriteLoader::Sprite *src_orig = ResizeSprite(sprite, z); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
272 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
273 |
uint size = src_orig->height * src_orig->width; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
274 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
275 |
dst_px_orig[z] = CallocT<Colour>(size + src_orig->height * 2); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
276 |
dst_n_orig[z] = CallocT<uint8>(size * 2 + src_orig->height * 4 * 2); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
277 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
278 |
uint32 *dst_px_ln = (uint32 *)dst_px_orig[z]; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
279 |
uint32 *dst_n_ln = (uint32 *)dst_n_orig[z]; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
280 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
281 |
const SpriteLoader::CommonPixel *src = (const SpriteLoader::CommonPixel *)src_orig->data; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
282 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
283 |
for (uint y = src_orig->height; y > 0; y--) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
284 |
Colour *dst_px = (Colour *)(dst_px_ln + 1); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
285 |
uint8 *dst_n = (uint8 *)(dst_n_ln + 1); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
286 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
287 |
uint8 *dst_len = dst_n++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
288 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
289 |
uint last = 3; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
290 |
int len = 0; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
291 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
292 |
for (uint x = src_orig->width; x > 0; x--) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
293 |
uint8 a = src->a; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
294 |
uint t = a > 0 && a < 255 ? 1 : a; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
295 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
296 |
if (last != t || len == 255) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
297 |
if (last != 3) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
298 |
*dst_len = len; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
299 |
dst_len = dst_n++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
300 |
} |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
301 |
len = 0; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
302 |
} |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
303 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
304 |
last = t; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
305 |
len++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
306 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
307 |
if (a != 0) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
308 |
dst_px->a = a; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
309 |
*dst_n = src->m; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
310 |
if (src->m != 0) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
311 |
/* Pre-convert the mapping channel to a RGB value */ |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
312 |
uint32 colour = this->LookupColourInPalette(src->m); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
313 |
dst_px->r = GB(colour, 16, 8); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
314 |
dst_px->g = GB(colour, 8, 8); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
315 |
dst_px->b = GB(colour, 0, 8); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
316 |
} else { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
317 |
dst_px->r = src->r; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
318 |
dst_px->g = src->g; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
319 |
dst_px->b = src->b; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
320 |
} |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
321 |
dst_px++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
322 |
dst_n++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
323 |
} else if (len == 1) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
324 |
dst_px++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
325 |
*dst_n = src->m; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
326 |
dst_n++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
327 |
} |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
328 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
329 |
src++; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
330 |
} |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
331 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
332 |
if (last != 3) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
333 |
*dst_len = len; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
334 |
} |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
335 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
336 |
dst_px = (Colour *)AlignPtr(dst_px, 4); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
337 |
dst_n = (uint8 *)AlignPtr(dst_n, 4); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
338 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
339 |
*dst_px_ln = (uint8 *)dst_px - (uint8 *)dst_px_ln; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
340 |
*dst_n_ln = (uint8 *)dst_n - (uint8 *)dst_n_ln; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
341 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
342 |
dst_px_ln = (uint32 *)dst_px; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
343 |
dst_n_ln = (uint32 *)dst_n; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
344 |
} |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
345 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
346 |
lengths[z][0] = (byte *)dst_px_ln - (byte *)dst_px_orig[z]; // all are aligned to 4B boundary |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
347 |
lengths[z][1] = (byte *)dst_n_ln - (byte *)dst_n_orig[z]; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
348 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
349 |
free(src_orig->data); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
350 |
free((void *)src_orig); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
351 |
} |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
352 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
353 |
uint len = 0; // total length of data |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
354 |
for (ZoomLevel z = ZOOM_LVL_BEGIN; z < ZOOM_LVL_END; z++) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
355 |
len += lengths[z][0] + lengths[z][1]; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
356 |
} |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
357 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
358 |
Sprite *dest_sprite = (Sprite *)allocator(sizeof(*dest_sprite) + sizeof(SpriteData) + len); |
8049
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
359 |
|
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
360 |
dest_sprite->height = sprite->height; |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
361 |
dest_sprite->width = sprite->width; |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
362 |
dest_sprite->x_offs = sprite->x_offs; |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
363 |
dest_sprite->y_offs = sprite->y_offs; |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
364 |
|
11082
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
365 |
SpriteData *dst = (SpriteData *)dest_sprite->data; |
8049
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
366 |
|
11082
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
367 |
for (ZoomLevel z = ZOOM_LVL_BEGIN; z < ZOOM_LVL_END; z++) { |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
368 |
dst->offset[z][0] = z == ZOOM_LVL_BEGIN ? 0 : lengths[z - 1][1] + dst->offset[z - 1][1]; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
369 |
dst->offset[z][1] = lengths[z][0] + dst->offset[z][0]; |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
370 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
371 |
memcpy(dst->data + dst->offset[z][0], dst_px_orig[z], lengths[z][0]); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
372 |
memcpy(dst->data + dst->offset[z][1], dst_n_orig[z], lengths[z][1]); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
373 |
|
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
374 |
free(dst_px_orig[z]); |
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
375 |
free(dst_n_orig[z]); |
8049
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
376 |
} |
11082
45ab75d184a0
(svn r13639) -Codechange: rewrite 32bpp-anim and 32bpp-optimized drawing and encoding so it uses similiar scheme as 8bpp-optimized
smatz
parents:
10894
diff
changeset
|
377 |
|
8049
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
378 |
return dest_sprite; |
00faaf0c0b52
(svn r11078) -Add: added 32bpp-optimized, which is almost twice as fast as 32bpp-simple (based on the work of frosch)
truelight
parents:
diff
changeset
|
379 |
} |