ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[D3D12] Samplers and fix blending not enabled

This commit is contained in:
Triang3l 2018-08-12 21:03:57 +03:00
parent de70451ac8
commit ebc5911634
2 changed files with 68 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/xenia/gpu/d3d12/pipeline_cache.cc
View File

@ -389,6 +389,7 @@ PipelineCache::UpdateStatus PipelineCache::UpdateBlendStateAndRenderTargets(
DXGI_FORMAT format = render_targets[i].format; DXGI_FORMAT format = render_targets[i].format;
if (blend_enable && format != DXGI_FORMAT_UNKNOWN && if (blend_enable && format != DXGI_FORMAT_UNKNOWN &&
(color_mask & (0xF << (guest_render_target * 4)))) { (color_mask & (0xF << (guest_render_target * 4)))) {
blend_desc.BlendEnable = TRUE;
uint32_t blend_control = regs.blendcontrol[guest_render_target]; uint32_t blend_control = regs.blendcontrol[guest_render_target];
// A2XX_RB_BLEND_CONTROL_COLOR_SRCBLEND // A2XX_RB_BLEND_CONTROL_COLOR_SRCBLEND
blend_desc.SrcBlend = kBlendFactorMap[(blend_control & 0x0000001F) >> 0]; blend_desc.SrcBlend = kBlendFactorMap[(blend_control & 0x0000001F) >> 0];

68
src/xenia/gpu/d3d12/texture_cache.cc
View File

@ -370,21 +370,75 @@ void TextureCache::WriteTextureSRV(uint32_t fetch_constant,
void TextureCache::WriteSampler(uint32_t fetch_constant, void TextureCache::WriteSampler(uint32_t fetch_constant,
D3D12_CPU_DESCRIPTOR_HANDLE handle) { D3D12_CPU_DESCRIPTOR_HANDLE handle) {
// TODO(Triang3l): Real samplers instead of this dummy. auto& regs = *register_file_;
uint32_t r = XE_GPU_REG_SHADER_CONSTANT_FETCH_00_0 + fetch_constant * 6;
auto group =
reinterpret_cast<const xenos::xe_gpu_fetch_group_t*>(&regs.values[r]);
auto& fetch = group->texture_fetch;
// TODO(Triang3l): Fetch shader instruction overrides.
D3D12_SAMPLER_DESC desc; D3D12_SAMPLER_DESC desc;
desc.Filter = D3D12_FILTER_MIN_MAG_MIP_POINT; if (fetch.aniso_filter) {
desc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; desc.Filter = D3D12_FILTER_ANISOTROPIC;
desc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; desc.MaxAnisotropy = std::min(1u << (fetch.aniso_filter - 1), 16u);
desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; } else {
desc.MipLODBias = 0.0f; D3D12_FILTER_TYPE filter_min =
TextureFilter(fetch.min_filter) == TextureFilter::kLinear
? D3D12_FILTER_TYPE_LINEAR
: D3D12_FILTER_TYPE_POINT;
D3D12_FILTER_TYPE filter_mag =
TextureFilter(fetch.mag_filter) == TextureFilter::kLinear
? D3D12_FILTER_TYPE_LINEAR
: D3D12_FILTER_TYPE_POINT;
D3D12_FILTER_TYPE filter_mip =
TextureFilter(fetch.mip_filter) == TextureFilter::kLinear
? D3D12_FILTER_TYPE_LINEAR
: D3D12_FILTER_TYPE_POINT;
// TODO(Triang3l): Investigate mip_filter TextureFilter::kBaseMap.
desc.Filter =
D3D12_ENCODE_BASIC_FILTER(filter_min, filter_mag, filter_mip,
D3D12_FILTER_REDUCTION_TYPE_STANDARD);
desc.MaxAnisotropy = 1; desc.MaxAnisotropy = 1;
}
// FIXME(Triang3l): Halfway and mirror clamp to border aren't mapped properly.
static const D3D12_TEXTURE_ADDRESS_MODE address_mode_map[] = {
/* kRepeat */ D3D12_TEXTURE_ADDRESS_MODE_WRAP,
/* kMirroredRepeat */ D3D12_TEXTURE_ADDRESS_MODE_MIRROR,
/* kClampToEdge */ D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
/* kMirrorClampToEdge */ D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE,
/* kClampToHalfway */ D3D12_TEXTURE_ADDRESS_MODE_CLAMP,
/* kMirrorClampToHalfway */ D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE,
/* kClampToBorder */ D3D12_TEXTURE_ADDRESS_MODE_BORDER,
/* kMirrorClampToBorder */ D3D12_TEXTURE_ADDRESS_MODE_MIRROR_ONCE,
};
desc.AddressU = address_mode_map[fetch.clamp_x];
desc.AddressV = address_mode_map[fetch.clamp_y];
desc.AddressW = address_mode_map[fetch.clamp_z];
desc.MipLODBias = fetch.lod_bias * (1.0f / 32.0f);
desc.ComparisonFunc = D3D12_COMPARISON_FUNC_NEVER; desc.ComparisonFunc = D3D12_COMPARISON_FUNC_NEVER;
// TODO(Triang3l): Border colors k_ACBYCR_BLACK and k_ACBCRY_BLACK.
if (BorderColor(fetch.border_color) == BorderColor::k_AGBR_White) {
desc.BorderColor[0] = 1.0f;
desc.BorderColor[1] = 1.0f;
desc.BorderColor[2] = 1.0f;
desc.BorderColor[3] = 1.0f;
} else {
desc.BorderColor[0] = 0.0f; desc.BorderColor[0] = 0.0f;
desc.BorderColor[1] = 0.0f; desc.BorderColor[1] = 0.0f;
desc.BorderColor[2] = 0.0f; desc.BorderColor[2] = 0.0f;
desc.BorderColor[3] = 0.0f; desc.BorderColor[3] = 0.0f;
desc.MinLOD = 0.0f; }
desc.MinLOD = float(fetch.mip_min_level);
desc.MaxLOD = float(fetch.mip_max_level);
uint32_t base_page = fetch.base_address & 0x1FFFF;
uint32_t mip_page = fetch.mip_address & 0x1FFFF;
if (base_page == 0 || base_page == mip_page) {
// Games should clamp mip level in this case anyway, but just for safety.
desc.MinLOD = std::max(desc.MinLOD, 1.0f);
}
if (mip_page == 0) {
desc.MaxLOD = 0.0f; desc.MaxLOD = 0.0f;
}
desc.MaxLOD = std::max(desc.MaxLOD, desc.MinLOD);
auto device = auto device =
command_processor_->GetD3D12Context()->GetD3D12Provider()->GetDevice(); command_processor_->GetD3D12Context()->GetD3D12Provider()->GetDevice();
device->CreateSampler(&desc, handle); device->CreateSampler(&desc, handle);