diff options
| author | hrydgard <hrydgard@gmail.com> | 2009-09-02 18:55:36 +0000 |
|---|---|---|
| committer | hrydgard <hrydgard@gmail.com> | 2009-09-02 18:55:36 +0000 |
| commit | e97bc516e64f2a471df28f77cba0461007746cf0 (patch) | |
| tree | 0cb9166b367ed2d1029f3bf59e79a60fd0553fbc /Source/Core/VideoCommon | |
| parent | dd7eba0bb9bb34cf40f2765119947ad379f83155 (diff) | |
Warning fixes/suppressions(aui), assorted code cleanup, d3d vertex shader cache expiration interval increased.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4165 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/Src/BPStructs.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/TextureDecoder.cpp | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp index 2e003a1b98..69a53799b7 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.cpp +++ b/Source/Core/VideoCommon/Src/BPStructs.cpp @@ -224,7 +224,7 @@ void BPWritten(const BPCmd& bp) float xfbLines = ((bpmem.copyTexSrcWH.y + 1.0f) * yScale); if ((u32)xfbLines > MAX_XFB_HEIGHT) { - WARN_LOG(VIDEO, "Tried to scale EFB to too many XFB lines (%f)", xfbLines); + INFO_LOG(VIDEO, "Tried to scale EFB to too many XFB lines (%f)", xfbLines); xfbLines = MAX_XFB_HEIGHT; } @@ -460,6 +460,7 @@ void BPWritten(const BPCmd& bp) case BPMEM_TX_SETMODE0+1: case BPMEM_TX_SETMODE0+2: case BPMEM_TX_SETMODE0+3: + SetSamplerState(bp); case BPMEM_TX_SETMODE1: case BPMEM_TX_SETMODE1+1: case BPMEM_TX_SETMODE1+2: @@ -472,7 +473,6 @@ void BPWritten(const BPCmd& bp) case BPMEM_TX_SETMODE1_4+1: case BPMEM_TX_SETMODE1_4+2: case BPMEM_TX_SETMODE1_4+3: - SetSamplerState(bp); break; // -------------------------------------------- // BPMEM_TX_SETIMAGE0 - Texture width, height, format diff --git a/Source/Core/VideoCommon/Src/TextureDecoder.cpp b/Source/Core/VideoCommon/Src/TextureDecoder.cpp index bb9e8f34d4..578846cda1 100644 --- a/Source/Core/VideoCommon/Src/TextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/TextureDecoder.cpp @@ -322,7 +322,7 @@ inline u32 makecol(int r, int g, int b, int a) void decodeDXTBlock(u32 *dst, const DXTBlock *src, int pitch) { - // S3TC Decoder (Note: GCN decodes differently from PC) + // S3TC Decoder (Note: GCN decodes differently from PC so we can't use native support) u16 c1 = Common::swap16(src->color1); u16 c2 = Common::swap16(src->color2); u8 blue1 = Convert5To8(c1 & 0x1F); @@ -331,9 +331,7 @@ void decodeDXTBlock(u32 *dst, const DXTBlock *src, int pitch) u8 green2 = Convert6To8((c2 >> 5) & 0x3F); u8 red1 = Convert5To8((c1 >> 11) & 0x1F); u8 red2 = Convert5To8((c2 >> 11) & 0x1F); - int colors[4]; - if (c1 > c2) { colors[0] = makecol(red1, green1, blue1, 255); @@ -457,10 +455,7 @@ PC_TexFormat TexDecoder_Decode_real(u8 *dst, const u8 *src, int width, int heigh 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) - { - //decodebytesIA4((u32*)dst+(y+iy)*width+x, src, 8); decodebytesIA4((u16*)dst + (y + iy) * width + x, src); - } } return PC_TEX_FMT_IA4_AS_IA8; case GX_TF_IA8: |