From ece0c1095d29d940796568d7ce20fd5f414c4066 Mon Sep 17 00:00:00 2001 From: Liam Date: Wed, 16 Nov 2022 22:28:58 -0500 Subject: maxwell3d: HLE multi-layer clear macro --- src/video_core/macro/macro_hle.cpp | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'src/video_core/macro') diff --git a/src/video_core/macro/macro_hle.cpp b/src/video_core/macro/macro_hle.cpp index f896591bf..6d35387d9 100644 --- a/src/video_core/macro/macro_hle.cpp +++ b/src/video_core/macro/macro_hle.cpp @@ -126,11 +126,31 @@ void HLE_3F5E74B9C9A50164(Engines::Maxwell3D& maxwell3d, const std::vector& } } -constexpr std::array, 4> hle_funcs{{ +// Multi-layer Clear +void HLE_EAD26C3E2109B06B(Engines::Maxwell3D& maxwell3d, const std::vector& parameters) { + ASSERT(parameters.size() == 1); + + Engines::Maxwell3D::Regs::ClearSurface clear_params{parameters[0]}; + + const u32 rt_index = clear_params.RT; + const u32 num_layers = maxwell3d.regs.rt[rt_index].depth_volume; + + for (u32 i = 0; i < num_layers; i++) { + // 0x674 = regs.clear_surface + maxwell3d.CallMethod(0x674, clear_params.raw, true); + clear_params.layer.Assign(clear_params.layer + 1); + + // FIXME: remove this when amdvlk can clear multiple layers without crashing + break; + } +} + +constexpr std::array, 5> hle_funcs{{ {0x771BB18C62444DA0, &HLE_771BB18C62444DA0}, {0x0D61FC9FAAC9FCAD, &HLE_0D61FC9FAAC9FCAD}, {0x0217920100488FF7, &HLE_0217920100488FF7}, {0x3F5E74B9C9A50164, &HLE_3F5E74B9C9A50164}, + {0xEAD26C3E2109B06B, &HLE_EAD26C3E2109B06B}, }}; class HLEMacroImpl final : public CachedMacro { -- cgit v1.2.3 From 4c42655a2defddcd8faacaaa4e0bf109693b5a9c Mon Sep 17 00:00:00 2001 From: Liam Date: Wed, 16 Nov 2022 22:41:40 -0500 Subject: maxwell3d: full HLE for multi-layer clears --- src/video_core/macro/macro_hle.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'src/video_core/macro') diff --git a/src/video_core/macro/macro_hle.cpp b/src/video_core/macro/macro_hle.cpp index 6d35387d9..0f3262edb 100644 --- a/src/video_core/macro/macro_hle.cpp +++ b/src/video_core/macro/macro_hle.cpp @@ -130,19 +130,13 @@ void HLE_3F5E74B9C9A50164(Engines::Maxwell3D& maxwell3d, const std::vector& void HLE_EAD26C3E2109B06B(Engines::Maxwell3D& maxwell3d, const std::vector& parameters) { ASSERT(parameters.size() == 1); - Engines::Maxwell3D::Regs::ClearSurface clear_params{parameters[0]}; - + const Engines::Maxwell3D::Regs::ClearSurface clear_params{parameters[0]}; const u32 rt_index = clear_params.RT; - const u32 num_layers = maxwell3d.regs.rt[rt_index].depth_volume; - - for (u32 i = 0; i < num_layers; i++) { - // 0x674 = regs.clear_surface - maxwell3d.CallMethod(0x674, clear_params.raw, true); - clear_params.layer.Assign(clear_params.layer + 1); + const u32 num_layers = maxwell3d.regs.rt[rt_index].depth; + ASSERT(clear_params.layer == 0); - // FIXME: remove this when amdvlk can clear multiple layers without crashing - break; - } + maxwell3d.regs.clear_surface.raw = clear_params.raw; + maxwell3d.ProcessClearBuffers(num_layers); } constexpr std::array, 5> hle_funcs{{ -- cgit v1.2.3