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] Don't use emit_then_cut due to RDNA 3 crash

This commit is contained in:
Triang3l 2023-04-09 18:07:44 +03:00
parent baa2ff78d8
commit 88c645d818
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2390,6 +2390,10 @@ void PipelineCache::CreateDxbcGeometryShader(
// to again. // to again.
// Also, FXC generates only movs (from statically or dynamically indexed // Also, FXC generates only movs (from statically or dynamically indexed
// v[#][#], from r#, or from a literal) to o# for some reason. // v[#][#], from r#, or from a literal) to o# for some reason.
// emit_then_cut_stream must not be used - it crashes the shader compiler of
// AMD Software: Adrenalin Edition 23.3.2 on RDNA 3 if it's conditional (after
// a `retc` or inside an `if`), and it doesn't seem to be generated by FXC or
// DXC at all.
// Discard the whole primitive if any vertex has a NaN position (may also be // Discard the whole primitive if any vertex has a NaN position (may also be
// set to NaN for emulation of vertex killing with the OR operator). // set to NaN for emulation of vertex killing with the OR operator).
@ -2535,11 +2539,9 @@ void PipelineCache::CreateDxbcGeometryShader(
dxbc::Src::V2D( dxbc::Src::V2D(
0, input_register_clip_and_cull_distances + (j >> 2))); 0, input_register_clip_and_cull_distances + (j >> 2)));
} }
if (i < 3) {
a.OpEmitStream(stream); a.OpEmitStream(stream);
} }
} a.OpCutStream(stream);
a.OpEmitThenCutStream(stream);
} break; } break;
case PipelineGeometryShader::kRectangleList: { case PipelineGeometryShader::kRectangleList: {
@ -2685,7 +2687,8 @@ void PipelineCache::CreateDxbcGeometryShader(
clip_distance_mask), clip_distance_mask),
dxbc::Src::R(1)); dxbc::Src::R(1));
} }
a.OpEmitThenCutStream(stream); a.OpEmitStream(stream);
a.OpCutStream(stream);
} break; } break;
case PipelineGeometryShader::kQuadList: { case PipelineGeometryShader::kQuadList: {
@ -2716,11 +2719,9 @@ void PipelineCache::CreateDxbcGeometryShader(
input_vertex_index, input_vertex_index,
input_register_clip_and_cull_distances + (j >> 2))); input_register_clip_and_cull_distances + (j >> 2)));
} }
if (i < 3) {
a.OpEmitStream(stream); a.OpEmitStream(stream);
} }
} a.OpCutStream(stream);
a.OpEmitThenCutStream(stream);
} break; } break;
default: default:

2
src/xenia/gpu/dxbc.h
View File

@ -2196,6 +2196,8 @@ class Assembler {
++stat_.instruction_count; ++stat_.instruction_count;
++stat_.cut_instruction_count; ++stat_.cut_instruction_count;
} }
// Don't use emit_then_cut_stream - crashes AMD Software: Adrenalin Edition
// 23.3.2 shader compiler on RDNA 3 if used conditionally.
void OpEmitThenCutStream(const Dest& stream) { void OpEmitThenCutStream(const Dest& stream) {
uint32_t operands_length = stream.GetLength(); uint32_t operands_length = stream.GetLength();
code_.reserve(code_.size() + 1 + operands_length); code_.reserve(code_.size() + 1 + operands_length);