Skip to content

L
libSDL
Commit 04b633b9 authored by Sam Lantinga's avatar Sam Lantinga
Browse files
Options

Optimized the copy blitters a little bit 

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402036
parent d11e6208
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 760 additions and 250 deletions
src/video/SDL_rendercopy.c
View file @ 04b633b9
This diff is collapsed.
src/video/SDL_rendercopy.h
View file @ 04b633b9
...@@ -26,9 +26,10 @@ ...@@ -26,9 +26,10 @@
#define SDL_RENDERCOPY_MODULATE_COLOR 0x0001 #define SDL_RENDERCOPY_MODULATE_COLOR 0x0001
#define SDL_RENDERCOPY_MODULATE_ALPHA 0x0002 #define SDL_RENDERCOPY_MODULATE_ALPHA 0x0002
#define SDL_RENDERCOPY_BLEND 0x0010 #define SDL_RENDERCOPY_MASK 0x0010
#define SDL_RENDERCOPY_ADD 0x0020 #define SDL_RENDERCOPY_BLEND 0x0020
#define SDL_RENDERCOPY_MOD 0x0040 #define SDL_RENDERCOPY_ADD 0x0040
#define SDL_RENDERCOPY_MOD 0x0080
#define SDL_RENDERCOPY_NEAREST 0x0100 #define SDL_RENDERCOPY_NEAREST 0x0100
typedef struct { typedef struct {
......
src/video/SDL_renderer_sw.c
View file @ 04b633b9
...@@ -628,9 +628,9 @@ SW_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, ...@@ -628,9 +628,9 @@ SW_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
copydata.flags |= SDL_RENDERCOPY_MODULATE_ALPHA; copydata.flags |= SDL_RENDERCOPY_MODULATE_ALPHA;
copydata.a = texture->a; copydata.a = texture->a;
} }
if (texture-> if (texture->blendMode & SDL_TEXTUREBLENDMODE_MASK) {
blendMode & (SDL_TEXTUREBLENDMODE_MASK | copydata.flags |= SDL_RENDERCOPY_MASK;
SDL_TEXTUREBLENDMODE_BLEND)) { } else if (texture->blendMode & SDL_TEXTUREBLENDMODE_BLEND) {
copydata.flags |= SDL_RENDERCOPY_BLEND; copydata.flags |= SDL_RENDERCOPY_BLEND;
} else if (texture->blendMode & SDL_TEXTUREBLENDMODE_ADD) { } else if (texture->blendMode & SDL_TEXTUREBLENDMODE_ADD) {
copydata.flags |= SDL_RENDERCOPY_ADD; copydata.flags |= SDL_RENDERCOPY_ADD;
......
src/video/sdlgenblit.pl
View file @ 04b633b9
...@@ -125,9 +125,10 @@ sub output_copydefs ...@@ -125,9 +125,10 @@ sub output_copydefs
print FILE <<__EOF__; print FILE <<__EOF__;
#define SDL_RENDERCOPY_MODULATE_COLOR 0x0001 #define SDL_RENDERCOPY_MODULATE_COLOR 0x0001
#define SDL_RENDERCOPY_MODULATE_ALPHA 0x0002 #define SDL_RENDERCOPY_MODULATE_ALPHA 0x0002
#define SDL_RENDERCOPY_BLEND 0x0010 #define SDL_RENDERCOPY_MASK 0x0010
#define SDL_RENDERCOPY_ADD 0x0020 #define SDL_RENDERCOPY_BLEND 0x0020
#define SDL_RENDERCOPY_MOD 0x0040 #define SDL_RENDERCOPY_ADD 0x0040
#define SDL_RENDERCOPY_MOD 0x0080
#define SDL_RENDERCOPY_NEAREST 0x0100 #define SDL_RENDERCOPY_NEAREST 0x0100
typedef struct { typedef struct {
...@@ -214,19 +215,35 @@ sub output_copycore ...@@ -214,19 +215,35 @@ sub output_copycore
my $dst = shift; my $dst = shift;
my $modulate = shift; my $modulate = shift;
my $blend = shift; my $blend = shift;
if ( $modulate ) { my $s = "";
my $d = "";
# Nice and easy...
if ( $src eq $dst && !$modulate && !$blend ) {
print FILE <<__EOF__; print FILE <<__EOF__;
if (flags & SDL_RENDERCOPY_MODULATE_COLOR) { *dst = *src;
${src}R = (${src}R * modulateR) / 255;
${src}G = (${src}G * modulateG) / 255;
${src}B = (${src}B * modulateB) / 255;
}
__EOF__ __EOF__
return;
}
if ( $blend ) {
get_rgba("src", $src);
get_rgba("dst", $dst);
$s = "src";
$d = "dst";
} else {
get_rgba("", $src);
} }
if ( $modulate && $blend ) {
if ( $modulate ) {
print FILE <<__EOF__; print FILE <<__EOF__;
if (flags & SDL_RENDERCOPY_MODULATE_COLOR) {
${s}R = (${s}R * modulateR) / 255;
${s}G = (${s}G * modulateG) / 255;
${s}B = (${s}B * modulateB) / 255;
}
if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) { if (flags & SDL_RENDERCOPY_MODULATE_ALPHA) {
${src}A = (${src}A * modulateA) / 255; ${s}A = (${s}A * modulateA) / 255;
} }
__EOF__ __EOF__
} }
...@@ -234,29 +251,43 @@ __EOF__ ...@@ -234,29 +251,43 @@ __EOF__
print FILE <<__EOF__; print FILE <<__EOF__;
if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) { if (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD)) {
/* This goes away if we ever use premultiplied alpha */ /* This goes away if we ever use premultiplied alpha */
${src}R = (${src}R * ${src}A) / 255; if (${s}A < 255) {
${src}G = (${src}G * ${src}A) / 255; ${s}R = (${s}R * ${s}A) / 255;
${src}B = (${src}B * ${src}A) / 255; ${s}G = (${s}G * ${s}A) / 255;
${s}B = (${s}B * ${s}A) / 255;
}
} }
switch (flags & (SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) { switch (flags & (SDL_RENDERCOPY_MASK|SDL_RENDERCOPY_BLEND|SDL_RENDERCOPY_ADD|SDL_RENDERCOPY_MOD)) {
case SDL_RENDERCOPY_MASK:
if (${s}A) {
${d}R = ${s}R;
${d}G = ${s}G;
${d}B = ${s}B;
}
break;
case SDL_RENDERCOPY_BLEND: case SDL_RENDERCOPY_BLEND:
${dst}R = ${src}R + ((255 - ${src}A) * ${dst}R) / 255; ${d}R = ${s}R + ((255 - ${s}A) * ${d}R) / 255;
${dst}G = ${src}G + ((255 - ${src}A) * ${dst}G) / 255; ${d}G = ${s}G + ((255 - ${s}A) * ${d}G) / 255;
${dst}B = ${src}B + ((255 - ${src}A) * ${dst}B) / 255; ${d}B = ${s}B + ((255 - ${s}A) * ${d}B) / 255;
break; break;
case SDL_RENDERCOPY_ADD: case SDL_RENDERCOPY_ADD:
${dst}R = ${src}R + ${dst}R; if (${dst}R > 255) ${dst}R = 255; ${d}R = ${s}R + ${d}R; if (${d}R > 255) ${d}R = 255;
${dst}G = ${src}G + ${dst}G; if (${dst}G > 255) ${dst}G = 255; ${d}G = ${s}G + ${d}G; if (${d}G > 255) ${d}G = 255;
${dst}B = ${src}B + ${dst}B; if (${dst}B > 255) ${dst}B = 255; ${d}B = ${s}B + ${d}B; if (${d}B > 255) ${d}B = 255;
break; break;
case SDL_RENDERCOPY_MOD: case SDL_RENDERCOPY_MOD:
${dst}R = (${src}R * ${dst}R) / 255; ${d}R = (${s}R * ${d}R) / 255;
${dst}G = (${src}G * ${dst}G) / 255; ${d}G = (${s}G * ${d}G) / 255;
${dst}B = (${src}B * ${dst}B) / 255; ${d}B = (${s}B * ${d}B) / 255;
break; break;
} }
__EOF__ __EOF__
} }
if ( $blend ) {
set_rgba("dst", $dst);
} else {
set_rgba("", $dst);
}
} }
sub output_copyfunc sub output_copyfunc
...@@ -325,20 +356,7 @@ __EOF__ ...@@ -325,20 +356,7 @@ __EOF__
print FILE <<__EOF__; print FILE <<__EOF__;
} }
__EOF__ __EOF__
if ( $blend ) { output_copycore($src, $dst, $modulate, $blend);
get_rgba("src", $src);
get_rgba("dst", $dst);
output_copycore("src", "dst", $modulate, $blend);
set_rgba("dst", $dst);
} elsif ( $modulate || $src ne $dst ) {
get_rgba("", $src);
output_copycore("", "", $modulate, $blend);
set_rgba("", $dst);
} else {
print FILE <<__EOF__;
*dst = *src;
__EOF__
}
print FILE <<__EOF__; print FILE <<__EOF__;
posx += incx; posx += incx;
++dst; ++dst;
...@@ -356,20 +374,7 @@ __EOF__ ...@@ -356,20 +374,7 @@ __EOF__
int n = data->dst_w; int n = data->dst_w;
while (n--) { while (n--) {
__EOF__ __EOF__
if ( $blend ) { output_copycore($src, $dst, $modulate, $blend);
get_rgba("src", $src);
get_rgba("dst", $dst);
output_copycore("src", "dst", $modulate, $blend);
set_rgba("dst", $dst);
} elsif ( $modulate || $src ne $dst ) {
get_rgba("", $src);
output_copycore("", "", $modulate, $blend);
set_rgba("", $dst);
} else {
print FILE <<__EOF__;
*dst = *src;
__EOF__
}
print FILE <<__EOF__; print FILE <<__EOF__;
++src; ++src;
++dst; ++dst;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment