From 046e5228518d6ae2698141cd2f2e9ba4d8935a2a Mon Sep 17 00:00:00 2001 From: raven02 Date: Sat, 30 May 2015 23:55:35 +0800 Subject: [PATCH] d3d12: Add DXT23 & DXT45 --- rpcs3/Emu/RSX/D3D12/D3D12Texture.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/rpcs3/Emu/RSX/D3D12/D3D12Texture.cpp b/rpcs3/Emu/RSX/D3D12/D3D12Texture.cpp index e2dd61a3d4..e95c12668a 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12Texture.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12Texture.cpp @@ -102,8 +102,6 @@ size_t D3D12GSRender::UploadTextures() case CELL_GCM_TEXTURE_A1R5G5B5: case CELL_GCM_TEXTURE_A4R4G4B4: case CELL_GCM_TEXTURE_R5G6B5: - case CELL_GCM_TEXTURE_COMPRESSED_DXT23: - case CELL_GCM_TEXTURE_COMPRESSED_DXT45: case CELL_GCM_TEXTURE_G8B8: case CELL_GCM_TEXTURE_R6G5B5: case CELL_GCM_TEXTURE_DEPTH24_D8: @@ -121,7 +119,7 @@ size_t D3D12GSRender::UploadTextures() case ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN) & CELL_GCM_TEXTURE_COMPRESSED_B8R8_G8R8: case ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN) & CELL_GCM_TEXTURE_COMPRESSED_R8B8_R8G8: default: - LOG_ERROR(RSX, "Unimplemented Texture format"); + LOG_ERROR(RSX, "Unimplemented Texture format : %x", format); break; case CELL_GCM_TEXTURE_D8R8G8B8: dxgiFormat = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -138,6 +136,16 @@ size_t D3D12GSRender::UploadTextures() blockSizeInByte = 8; blockWidthInPixel = 4, blockHeightInPixel = 4; break; + case CELL_GCM_TEXTURE_COMPRESSED_DXT23: + dxgiFormat = DXGI_FORMAT_BC2_UNORM; + blockSizeInByte = 16; + blockWidthInPixel = 4, blockHeightInPixel = 4; + break; + case CELL_GCM_TEXTURE_COMPRESSED_DXT45: + dxgiFormat = DXGI_FORMAT_BC3_UNORM; + blockSizeInByte = 16; + blockWidthInPixel = 4, blockHeightInPixel = 4; + break; case CELL_GCM_TEXTURE_B8: dxgiFormat = DXGI_FORMAT_R8_UNORM; blockSizeInByte = 1; @@ -299,4 +307,4 @@ size_t D3D12GSRender::UploadTextures() return usedTexture; } -#endif \ No newline at end of file +#endif