From b9be3245e1bcd3929baf4d1c66fe5a14b336cdbc Mon Sep 17 00:00:00 2001 From: Scott Mansell Date: Sat, 5 Sep 2015 02:45:29 +1200 Subject: Move common EFB copy code into VideoCommon Addded a few duplicated depth copy texture formats to the enum in TextureDecoder.h. These texture formats were already implemented in TextureCacheBase and the ogl/dx11 texture cache implementations. --- Source/Core/VideoBackends/D3D/TextureEncoder.h | 89 +------------------------- 1 file changed, 2 insertions(+), 87 deletions(-) (limited to 'Source/Core/VideoBackends/D3D/TextureEncoder.h') diff --git a/Source/Core/VideoBackends/D3D/TextureEncoder.h b/Source/Core/VideoBackends/D3D/TextureEncoder.h index a2a2a34fdb..445fffd218 100644 --- a/Source/Core/VideoBackends/D3D/TextureEncoder.h +++ b/Source/Core/VideoBackends/D3D/TextureEncoder.h @@ -5,96 +5,11 @@ #pragma once #include "VideoCommon/BPMemory.h" +#include "VideoCommon/TextureCacheBase.h" #include "VideoCommon/VideoCommon.h" namespace DX11 { - -// 4-bit format: 8x8 texels / cache line -// 8-bit format: 8x4 texels / cache line -// 16-bit format: 4x4 texels / cache line -// 32-bit format: 4x4 texels / 2 cache lines -// Compressed format: 8x8 texels / cache line - -// Document EFB encoding formats here with examples of where they are used. - -// Format: 0 - R4 -// Used in The Legend of Zelda: The Wind Waker for character shadows (srcFormat 1, -// isIntensity 1, scaleByHalf 1). - -// Format: 1 - R8 -// FIXME: Unseen. May or may not be a duplicate of format 8. - -// Format: 2 - A4 R4 -// FIXME: Unseen. - -// Format: 3 - A8 R8 -// FIXME: Unseen. - -// Format: 4 - R5 G6 B5 -// Used in Wind Waker for most render-to-texture effects like heat shimmer and -// depth-of-field. - -// Format: 5 - 1 R5 G5 B5 or 0 A3 R4 G4 B4 -// Used in Twilight Princess for character shadows. - -// Format: 6 - A8 R8 A8 R8 | G8 B8 G8 B8 -// Used in Twilight Princess for bloom effect. - -// Format: 7 - A8 -// Used in Metroid Prime 2 for the scan visor. - -// Format: 8 - R8 -// Used in Twilight Princess for the map. - -// Format: 9 - G8 -// FIXME: Unseen. - -// Format: A - B8 -// Used in Metroid Prime 2 for the scan visor. - -// Format: B - G8 R8 -// Used in Wind Waker for depth-of-field. Usually used with srcFormat 3 to -// render depth textures. The bytes are swapped, so games have to correct it -// in RAM before using it as a texture. - -// Format: C - B8 G8 -// FIXME: Unseen. - -const unsigned int BLOCK_WIDTHS[16] = { - 8, // R4 - 8, // R8 (FIXME: duplicate of R8 below?) - 8, // A4 R4 - 4, // A8 R8 - 4, // R5 G6 B5 - 4, // 1 R5 G5 B5 or 0 A3 R4 G4 B4 - 4, // A8 R8 A8 R8 | G8 B8 G8 B8 (two cache lines) - 8, // A8 - 8, // R8 (FIXME: duplicate of R8 above?) - 8, // G8 - 8, // B8 - 4, // G8 R8 - 4, // B8 G8 - 0, 0, 0 // Unknown formats -}; - -const unsigned int BLOCK_HEIGHTS[16] = { - 8, // R4 - 4, // R8 (FIXME: duplicate of R8 below?) - 4, // A4 R4 - 4, // A8 R8 - 4, // R5 G6 B5 - 4, // 1 R5 G5 B5 or 0 A3 R4 G4 B4 - 4, // A8 R8 A8 R8 | G8 B8 G8 B8 (two cache lines) - 4, // A8 - 4, // R8 (FIXME: duplicate of R8 above?) - 4, // G8 - 4, // B8 - 4, // G8 R8 - 4, // B8 G8 - 0, 0, 0 // Unknown formats -}; - // Maximum number of bytes that can occur in a texture block-row generated by // the encoder static const UINT MAX_BYTES_PER_BLOCK_ROW = (EFB_WIDTH/4)*64; @@ -111,7 +26,7 @@ public: virtual void Init() = 0; virtual void Shutdown() = 0; // Returns size in bytes of encoded block of memory - virtual size_t Encode(u8* dst, unsigned int dstFormat, size_t dstStride, + virtual void Encode(u8* dst, const TextureCache::TCacheEntryBase *texture_entry, PEControl::PixelFormat srcFormat, const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf) = 0; -- cgit v1.2.3