archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 03:11:51 +02:00
Code Issues Projects Releases Packages Wiki Activity

Minor speedup in texdecoder. More informative fifo error messages.

Browse source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@249 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2008-08-20 18:31:48 +00:00
parent f2b45beb90
commit 683ba7ecae
3 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Source/Core/VideoCommon/Src/TextureDecoder.cpp
View file

@ -256,23 +256,20 @@ inline void decodebytesRGB5A3(u32 *dst, const u16 *src, int numpixels)
dst[x] = decode5A3(Common::swap16(src[x])); dst[x] = decode5A3(Common::swap16(src[x]));
} }
inline void decodebytesARGB8pass1(u32 *dst, const u16 *src, const u16 *src2, int numpixels) // This one is used by many video formats. It'd therefore be good if it was fast.
inline void decodebytesARGB8_4(u32 *dst, const u16 *src, const u16 *src2)
{ {
// This can probably be done in a few SSE pack/unpack instructions. for (int x = 0; x < 4; x++) {
for (int x = 0; x < numpixels; x++) {
dst[x] = Common::swap32((src2[x] << 16) | src[x]); dst[x] = Common::swap32((src2[x] << 16) | src[x]);
} }
}
inline void decodebytesARGB8pass2(u32 *dst, const u16 *src, int numpixels) // This can probably be done in a few SSE pack/unpack instructions + pshufb
{ // some unpack instruction x2:
for (int x = 0; x < numpixels; x++) // ABABABABABABABAB 1212121212121212 ->
{ // AB12AB12AB12AB12 AB12AB12AB12AB12
int val = Common::swap16(src[x]); // 2x pshufb->
int a = val & 0xFF; // 21BA21BA21BA21BA 21BA21BA21BA21BA
val >>= 8; // and we are done.
*dst++ |= (val<<8) | (a<<0);
}
} }
inline u32 makecol(int r, int g, int b, int a) inline u32 makecol(int r, int g, int b, int a)
@ -411,7 +408,7 @@ PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, in
for (int x = 0; x < width; x += 4) for (int x = 0; x < width; x += 4)
{ {
for (int iy = 0; iy < 4; iy++) { for (int iy = 0; iy < 4; iy++) {
decodebytesARGB8pass1((u32*)dst + (y+iy)*width + x, (u16*)src + 4 * iy, (u16*)src + 4 * iy + 16, 4); decodebytesARGB8_4((u32*)dst + (y+iy)*width + x, (u16*)src + 4 * iy, (u16*)src + 4 * iy + 16);
} }
src += 64; src += 64;
} }

10
Source/Plugins/Plugin_VideoDX9/Src/Fifo.cpp
View file

@ -46,11 +46,11 @@ void Fifo_Shutdown()
int FAKE_GetFifoSize() int FAKE_GetFifoSize()
{ {
if (size < readptr) if (size < readptr)
{ {
PanicAlert("GFX Fifo underrun encountered."); PanicAlert("GFX Fifo underrun encountered (size = %i, readptr = %i)", size, readptr);
} }
return (size - readptr); return (size - readptr);
} }
u8 FAKE_PeekFifo8(u32 _uOffset) u8 FAKE_PeekFifo8(u32 _uOffset)

2
Source/Plugins/Plugin_VideoOGL/Src/Fifo.cpp
View file

@ -46,7 +46,7 @@ int FAKE_GetFifoSize()
{ {
if (size < readptr) if (size < readptr)
{ {
PanicAlert("GFX Fifo underrun encountered."); PanicAlert("GFX Fifo underrun encountered (size = %i, readptr = %i)", size, readptr);
} }
return (size - readptr); return (size - readptr);
} }