piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add some missing GPL headers, fix building with Platform SDK 6.0, delete unused HTTP code.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@452 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2008-09-07 10:29:46 +00:00
parent 5ac0c33530
commit 5a69fca0be
71 changed files with 1023 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/VideoCommon/Src/LookUpTables.cpp
View File

@ -17,9 +17,13 @@
#include "LookUpTables.h"
int lut3to8[8];
int lut4to8[16];
int lut5to8[32];
const int lut3to8[] = { 0x00,0x24,0x48,0x6D,0x91,0xB6,0xDA,0xFF};
const int lut4to8[] = { 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,
0x88,0x99,0xAA,0xBB,0xCC,0xDD,0xEE,0xFF};
const int lut5to8[] = { 0x00,0x08,0x10,0x18,0x20,0x29,0x31,0x39,
0x41,0x4A,0x52,0x5A,0x62,0x6A,0x73,0x7B,
0x83,0x8B,0x94,0x9C,0xA4,0xAC,0xB4,0xBD,
0xC5,0xCD,0xD5,0xDE,0xE6,0xEE,0xF6,0xFF};
int lut6to8[64];
float lutu8tosfloat[256];
float lutu8toufloat[256];
@ -27,12 +31,6 @@ float luts8tosfloat[256];
void InitLUTs()
{
for (int i = 0; i < 8; i++)
lut3to8[i] = (i*255) / 7;
for (int i = 0; i < 16; i++)
lut4to8[i] = (i*255) / 15;
for (int i = 0; i < 32; i++)
lut5to8[i] = (i*255) / 31;
for (int i = 0; i < 64; i++)
lut6to8[i] = (i*255) / 63;
for (int i = 0; i < 256; i++)

6
Source/Core/VideoCommon/Src/LookUpTables.h
View File

@ -20,9 +20,9 @@
#include "Common.h"
extern int lut3to8[8];
extern int lut4to8[16];
extern int lut5to8[32];
extern const int lut3to8[8];
extern const int lut4to8[16];
extern const int lut5to8[32];
extern int lut6to8[64];
extern float lutu8tosfloat[256];
extern float lutu8toufloat[256];

4
Source/Core/VideoCommon/Src/Profiler.cpp
View File

@ -33,7 +33,11 @@ int g_bWriteProfile=0;
#ifdef _WIN32
#if defined (_MSC_VER) && _MSC_VER >= 1400
#define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set
#define _interlockedbittestandreset workaround_ms_header_bug_platform_sdk6_reset
#include <intrin.h>
#undef _interlockedbittestandset
#undef _interlockedbittestandreset
#pragma intrinsic(__rdtsc)
#endif

13
Source/Core/VideoCommon/Src/TextureDecoder.cpp
View File

@ -148,11 +148,11 @@ inline void decodebytesI4(u32 *dst, const u8 *src, int numbytes)
}
}
inline void decodebytesI8(u32 *dst, const u8 *src, int numbytes)
inline void decodebytesI8_8(u32 *dst, const u8 *src)
{
// TODO: SSSE3 variant (pshufb), possibly SSE2 variant (packuswb). THP videos use this format.
for (int x = 0; x < numbytes; x++)
*dst++ = expand8888(src[x]);
for (int x = 0; x < 8; x++)
dst[x] = src[x] * 0x01010101; //expand8888(src[x]); *0x... may or may not be faster. not sure. Should be faster on P4 at least.
}
inline void decodebytesC4(u32 *dst, const u8 *src, int numbytes, int tlutaddr, int tlutfmt)
@ -356,12 +356,12 @@ PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, in
decodebytesC8((u32*)dst+(y+iy)*width+x, src, 8, tlutaddr, tlutfmt);
}
return PC_TEX_FMT_BGRA32;
case GX_TF_I8:
case GX_TF_I8: // speed critical
{
for (int y = 0; y < height; y += 4)
for (int x = 0; x < width; x += 8)
for (int iy = 0; iy < 4; iy++, src += 8)
decodebytesI8((u32*)dst+(y+iy)*width+x, src, 8);
decodebytesI8_8((u32*)dst+(y+iy)*width+x, src);
}
return PC_TEX_FMT_BGRA32;
case GX_TF_IA4:
@ -404,7 +404,7 @@ PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, in
decodebytesRGB5A3((u32*)dst+(y+iy)*width+x, (u16*)src, 4);
}
return PC_TEX_FMT_BGRA32;
case GX_TF_RGBA8:
case GX_TF_RGBA8: // speed critical
{
for (int y = 0; y < height; y += 4) {
for (int x = 0; x < width; x += 4)
@ -419,6 +419,7 @@ PC_TexFormat TexDecoder_Decode(u8 *dst, const u8 *src, int width, int height, in
return PC_TEX_FMT_BGRA32;
case GX_TF_CMPR:
{
// TODO: Shuffle to PC S3TC (DXTC) format instead of converting
// 11111111 22222222 55555555 66666666
// 33333333 44444444 77777777 88888888
for (int y = 0; y < height; y += 8)