mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-17 08:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

DX12: Align to multiple of 4 block for DXTC format (#2125)

Browse Source
This commit is contained in:
raven02 2016-09-05 08:47:45 +08:00 committed by GitHub
parent ad39615141
commit 03a5b5be1a
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
rpcs3/Emu/RSX/D3D12/D3D12Texture.cpp
View File

@ -8,6 +8,19 @@
#include "D3D12Formats.h" #include "D3D12Formats.h"
#include "../rsx_methods.h" #include "../rsx_methods.h"
bool is_dxtc_format(u32 texture_format)
{
switch (texture_format)
{
case CELL_GCM_TEXTURE_COMPRESSED_DXT1:
case CELL_GCM_TEXTURE_COMPRESSED_DXT23:
case CELL_GCM_TEXTURE_COMPRESSED_DXT45:
return true;
default:
return false;
}
}
namespace namespace
{ {
D3D12_COMPARISON_FUNC get_sampler_compare_func[] = D3D12_COMPARISON_FUNC get_sampler_compare_func[] =
@ -47,17 +60,28 @@ namespace
{ {
const u8 format = texture.format() & ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN); const u8 format = texture.format() & ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN);
DXGI_FORMAT dxgi_format = get_texture_format(format); DXGI_FORMAT dxgi_format = get_texture_format(format);
u16 width = texture.width();
u16 height = texture.height();
u16 depth = texture.depth();
u16 miplevels = texture.get_exact_mipmap_count();
// DXTC uses 4x4 block texture and align to multiple of 4.
if (is_dxtc_format(format))
{
width = align(width, 4);
height = align(height, 4);
}
switch (texture.get_extended_texture_dimension()) switch (texture.get_extended_texture_dimension())
{ {
case rsx::texture_dimension_extended::texture_dimension_1d: case rsx::texture_dimension_extended::texture_dimension_1d:
return CD3DX12_RESOURCE_DESC::Tex1D(dxgi_format, texture.width(), 1, texture.get_exact_mipmap_count()); return CD3DX12_RESOURCE_DESC::Tex1D(dxgi_format, width, 1, miplevels);
case rsx::texture_dimension_extended::texture_dimension_2d: case rsx::texture_dimension_extended::texture_dimension_2d:
return CD3DX12_RESOURCE_DESC::Tex2D(dxgi_format, texture.width(), texture.height(), 1, texture.get_exact_mipmap_count()); return CD3DX12_RESOURCE_DESC::Tex2D(dxgi_format, width, height, 1, miplevels);
case rsx::texture_dimension_extended::texture_dimension_cubemap: case rsx::texture_dimension_extended::texture_dimension_cubemap:
return CD3DX12_RESOURCE_DESC::Tex2D(dxgi_format, texture.width(), texture.height(), 6, texture.get_exact_mipmap_count()); return CD3DX12_RESOURCE_DESC::Tex2D(dxgi_format, width, height, 6, miplevels);
case rsx::texture_dimension_extended::texture_dimension_3d: case rsx::texture_dimension_extended::texture_dimension_3d:
return CD3DX12_RESOURCE_DESC::Tex3D(dxgi_format, texture.width(), texture.height(), texture.depth(), texture.get_exact_mipmap_count()); return CD3DX12_RESOURCE_DESC::Tex3D(dxgi_format, width, height, depth, miplevels);
} }
fmt::throw_exception("Unknown texture dimension" HERE); fmt::throw_exception("Unknown texture dimension" HERE);
} }