From d70efb0b89f238261f608b7a2c7fa17753aeabef Mon Sep 17 00:00:00 2001 From: CamilleLaVey Date: Wed, 14 Jan 2026 19:54:31 -0400 Subject: [PATCH] Revert "[engines, maxwell, video_core, texture_cache] Implement IsMethodExecutableConstexpr and refactor UpdateRenderTargets" --- src/video_core/engines/maxwell_3d.h | 17 ----------------- src/video_core/texture_cache/texture_cache.h | 15 ++++++--------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/src/video_core/engines/maxwell_3d.h b/src/video_core/engines/maxwell_3d.h index 3e09cf5bd0..8c50a4ea2f 100644 --- a/src/video_core/engines/maxwell_3d.h +++ b/src/video_core/engines/maxwell_3d.h @@ -54,23 +54,6 @@ class DrawManager; #define MAXWELL3D_REG_INDEX(field_name) (offsetof(Maxwell3D::Regs, field_name) / sizeof(u32)) -constexpr bool IsMethodExecutableConstexpr(u32 method) { - if (method >= 0xE00) { - return true; - } - return method == 0x0585 || method == 0x0586 || method == 0x035D || method == 0x035E || - method == 0x0364 || method == 0x0365 || method == 0x1296 || method == 0x163B || - method == 0x163C || method == 0x163D || method == 0x1640 || method == 0x1641 || - method == 0x1642 || method == 0x1646 || method == 0x1647 || method == 0x035F || - method == 0x0586 || method == 0x0D61 || method == 0x031E || method == 0x0B07 || - method == 0x0545 || method == 0x0546 || method == 0x0547 || method == 0x0830 || - (method >= 0x02CB && method <= 0x02DA) || - (method >= 0x0D00 && method <= 0x0D04) || - method == 0x0D1C || method == 0x19D0 || method == 0x06C0 || method == 0x06C3 || - method == 0x0A04 || method == 0x0DF0 || method == 0x1574 || method == 0x1608 || - method == 0x1609 || method == 0x160A; -} - class Maxwell3D final : public EngineInterface { public: explicit Maxwell3D(Core::System& system, MemoryManager& memory_manager); diff --git a/src/video_core/texture_cache/texture_cache.h b/src/video_core/texture_cache/texture_cache.h index 17679b99b6..6ab57cd341 100644 --- a/src/video_core/texture_cache/texture_cache.h +++ b/src/video_core/texture_cache/texture_cache.h @@ -496,7 +496,7 @@ template void TextureCache

::UpdateRenderTargets(bool is_clear) { using namespace VideoCommon::Dirty; auto& flags = maxwell3d->dirty.flags; - if (!flags[Dirty::RenderTargets]) { + if (is_clear || !flags[Dirty::RenderTargets]) { for (size_t index = 0; index < NUM_RT; ++index) { ImageViewId& color_buffer_id = render_targets.color_buffer_ids[index]; PrepareImageView(color_buffer_id, true, is_clear && IsFullClear(color_buffer_id)); @@ -506,14 +506,11 @@ void TextureCache

::UpdateRenderTargets(bool is_clear) { return; } - bool rescaled = is_rescaling; - if (!is_clear) { - rescaled = RescaleRenderTargets(); - if (is_rescaling != rescaled) { - flags[Dirty::RescaleViewports] = true; - flags[Dirty::RescaleScissors] = true; - is_rescaling = rescaled; - } + const bool rescaled = RescaleRenderTargets(); + if (is_rescaling != rescaled) { + flags[Dirty::RescaleViewports] = true; + flags[Dirty::RescaleScissors] = true; + is_rescaling = rescaled; } for (size_t index = 0; index < NUM_RT; ++index) {