fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DXBC] Remove alphatest/A2C with [earlydepthstencil]

Browse Source
This commit is contained in:
Triang3l
2022-06-26 15:31:08 +03:00
parent b787f2dec1
commit e0b890fe5c
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/xenia/gpu/dxbc_shader_translator.cc
View File

@@ -3236,7 +3236,8 @@ void DxbcShaderTranslator::WriteOutputSignature() {
// Coverage output for alpha to mask (SV_Coverage). // Coverage output for alpha to mask (SV_Coverage).
size_t coverage_position = SIZE_MAX; size_t coverage_position = SIZE_MAX;
if (color_targets_written & 0b1) { if ((color_targets_written & 0b1) &&
!IsForceEarlyDepthStencilGlobalFlagEnabled()) {
coverage_position = shader_object_.size(); coverage_position = shader_object_.size();
shader_object_.resize(shader_object_.size() + kParameterDwords); shader_object_.resize(shader_object_.size() + kParameterDwords);
++parameter_count; ++parameter_count;
@@ -3364,14 +3365,11 @@ void DxbcShaderTranslator::WriteShaderCode() {
// Don't allow refactoring when converting to native code to maintain position // Don't allow refactoring when converting to native code to maintain position
// invariance (needed even in pixel shaders for oDepth invariance). // invariance (needed even in pixel shaders for oDepth invariance).
uint32_t global_flags = 0; bool global_flag_force_early_depth_stencil =
if (is_pixel_shader() && IsForceEarlyDepthStencilGlobalFlagEnabled();
GetDxbcShaderModification().pixel.depth_stencil_mode == ao_.OpDclGlobalFlags(global_flag_force_early_depth_stencil
Modification::DepthStencilMode::kEarlyHint && ? dxbc::kGlobalFlagForceEarlyDepthStencil
!edram_rov_used_ && current_shader().implicit_early_z_write_allowed()) { : 0);
global_flags |= dxbc::kGlobalFlagForceEarlyDepthStencil;
}
ao_.OpDclGlobalFlags(global_flags);
// Constant buffers, from most frequenly accessed to least frequently accessed // Constant buffers, from most frequenly accessed to least frequently accessed
// (the order is a hint to the driver according to the DXBC header). // (the order is a hint to the driver according to the DXBC header).
@@ -3655,7 +3653,8 @@ void DxbcShaderTranslator::WriteShaderCode() {
} }
} }
// Coverage output for alpha to mask. // Coverage output for alpha to mask.
if (color_targets_written & 0b1) { if ((color_targets_written & 0b1) &&
!global_flag_force_early_depth_stencil) {
ao_.OpDclOutput(dxbc::Dest::OMask()); ao_.OpDclOutput(dxbc::Dest::OMask());
} }
// Depth output. // Depth output.

8
src/xenia/gpu/dxbc_shader_translator.h
View File

@@ -656,6 +656,14 @@ class DxbcShaderTranslator : public ShaderTranslator {
GetDxbcShaderModification().vertex.host_vertex_shader_type); GetDxbcShaderModification().vertex.host_vertex_shader_type);
} }
bool IsForceEarlyDepthStencilGlobalFlagEnabled() const {
return is_pixel_shader() &&
GetDxbcShaderModification().pixel.depth_stencil_mode ==
Modification::DepthStencilMode::kEarlyHint &&
!edram_rov_used_ &&
current_shader().implicit_early_z_write_allowed();
}
// Whether to use switch-case rather than if (pc >= label) for control flow. // Whether to use switch-case rather than if (pc >= label) for control flow.
bool UseSwitchForControlFlow() const; bool UseSwitchForControlFlow() const;

6
src/xenia/gpu/dxbc_shader_translator_om.cc
View File

@@ -1979,7 +1979,8 @@ void DxbcShaderTranslator::CompletePixelShader_AlphaToMaskSample(
void DxbcShaderTranslator::CompletePixelShader_AlphaToMask() { void DxbcShaderTranslator::CompletePixelShader_AlphaToMask() {
// Check if alpha to coverage can be done at all in this shader. // Check if alpha to coverage can be done at all in this shader.
if (!current_shader().writes_color_target(0)) { if (!current_shader().writes_color_target(0) ||
IsForceEarlyDepthStencilGlobalFlagEnabled()) {
return; return;
} }
@@ -2987,7 +2988,8 @@ void DxbcShaderTranslator::CompletePixelShader() {
return; return;
} }
if (current_shader().writes_color_target(0)) { if (current_shader().writes_color_target(0) &&
!IsForceEarlyDepthStencilGlobalFlagEnabled()) {
// Alpha test. // Alpha test.
// X - mask, then masked result (SGPR for loading, VGPR for masking). // X - mask, then masked result (SGPR for loading, VGPR for masking).
// Y - operation result (SGPR for mask operations, VGPR for alpha // Y - operation result (SGPR for mask operations, VGPR for alpha