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

Fixed texture overlays. Can I remove the OVERLAY_TEXFMT definition? It just makes the code look messy.

Browse source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2306 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
XTra.KrazzY 2009-02-19 01:24:33 +00:00
parent 0b1909aed0
commit c5aed83513
1 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,10 +21,7 @@
#include "CPUDetect.h" #include "CPUDetect.h"
#include "TextureDecoder.h" #include "TextureDecoder.h"
#include "LookUpTables.h" #include "LookUpTables.h"
#include <emmintrin.h>
#ifdef __SSSE3__
#include <tmmintrin.h>
#endif
//Uncomment this to enable Texture Format ID overlays //Uncomment this to enable Texture Format ID overlays
#define OVERLAY_TEXFMT #define OVERLAY_TEXFMT
@ -506,9 +503,6 @@ PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, in
if((!TexFmt_Overlay_Enable)||(retval==PC_TEX_FMT_NONE)) if((!TexFmt_Overlay_Enable)||(retval==PC_TEX_FMT_NONE))
return retval; return retval;
// assume ABGR/ARGB (32bit)
int *dtp = (int*)dst;
int w = min(width,40); int w = min(width,40);
int h = min(height,10); int h = min(height,10);
@ -539,7 +533,35 @@ PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, in
{ {
for(int x=0;x<xcnt;x++) for(int x=0;x<xcnt;x++)
{ {
switch(retval) {
case PC_TEX_FMT_I8:
{
// TODO: Is this an acceptable way to draw in I8?
u8 *dtp = (u8*)dst;
dtp[(y+yoff)*width + x+xoff] = ptr[x]?0xFF:0x88;
break;
}
case PC_TEX_FMT_IA8:
case PC_TEX_FMT_IA4:
{
u16 *dtp = (u16*)dst;
dtp[(y+yoff)*width + x+xoff] = ptr[x]?0xFFFF:0xFF00;
break;
}
case PC_TEX_FMT_RGB565:
{
u16 *dtp = (u16*)dst;
dtp[(y+yoff)*width + x+xoff] = ptr[x]?0xFFFF:0x0000;
break;
}
default:
case PC_TEX_FMT_BGRA32:
{
int *dtp = (int*)dst;
dtp[(y+yoff)*width + x+xoff] = ptr[x]?0xFFFFFFFF:0xFF000000; dtp[(y+yoff)*width + x+xoff] = ptr[x]?0xFFFFFFFF:0xFF000000;
break;
}
}
} }
ptr+=9; ptr+=9;
} }