VERY experimental Nintendo Switch 2 emulator
C++
state_tracker: workaround channel setup for homebrew
Liam78362ac6dd68
diff --git a/src/video_core/query_cache.h b/src/video_core/query_cache.hindex eb68ea6388..b0ebe71b74 100644--- a/src/video_core/query_cache.h+++ b/src/video_core/query_cache.h@@ -135,8 +135,10 @@ public:/// Updates counters from GPU state. Expected to be called once per draw, clear or dispatch.void UpdateCounters() {std::unique_lock lock{mutex};- const auto& regs = maxwell3d->regs;- Stream(VideoCore::QueryType::SamplesPassed).Update(regs.samplecnt_enable);+ if (maxwell3d) {+ const auto& regs = maxwell3d->regs;+ Stream(VideoCore::QueryType::SamplesPassed).Update(regs.samplecnt_enable);+ }}/// Resets a counter to zero. It doesn't disable the query after resetting.diff --git a/src/video_core/renderer_opengl/gl_state_tracker.cpp b/src/video_core/renderer_opengl/gl_state_tracker.cppindex 3657f867d3..a8f3a0f57b 100644--- a/src/video_core/renderer_opengl/gl_state_tracker.cpp+++ b/src/video_core/renderer_opengl/gl_state_tracker.cpp@@ -237,6 +237,6 @@ void StateTracker::InvalidateState() {flags->set();}-StateTracker::StateTracker() : flags{} {}+StateTracker::StateTracker() : flags{&default_flags} {}} // namespace OpenGLdiff --git a/src/video_core/renderer_opengl/gl_state_tracker.h b/src/video_core/renderer_opengl/gl_state_tracker.hindex 97d32768b5..19bcf3f355 100644--- a/src/video_core/renderer_opengl/gl_state_tracker.h+++ b/src/video_core/renderer_opengl/gl_state_tracker.h@@ -223,6 +223,7 @@ public:private:Tegra::Engines::Maxwell3D::DirtyState::Flags* flags;+ Tegra::Engines::Maxwell3D::DirtyState::Flags default_flags{};GLuint framebuffer = 0;GLuint index_buffer = 0;diff --git a/src/video_core/renderer_vulkan/vk_state_tracker.cpp b/src/video_core/renderer_vulkan/vk_state_tracker.cppindex 5a11d3267b..f234e1a310 100644--- a/src/video_core/renderer_vulkan/vk_state_tracker.cpp+++ b/src/video_core/renderer_vulkan/vk_state_tracker.cpp@@ -206,6 +206,7 @@ void StateTracker::InvalidateState() {flags->set();}-StateTracker::StateTracker() : flags{}, invalidation_flags{MakeInvalidationFlags()} {}+StateTracker::StateTracker()+ : flags{&default_flags}, default_flags{}, invalidation_flags{MakeInvalidationFlags()} {}} // namespace Vulkandiff --git a/src/video_core/renderer_vulkan/vk_state_tracker.h b/src/video_core/renderer_vulkan/vk_state_tracker.hindex c107d9c246..2296dea602 100644--- a/src/video_core/renderer_vulkan/vk_state_tracker.h+++ b/src/video_core/renderer_vulkan/vk_state_tracker.h@@ -161,6 +161,7 @@ private:}Tegra::Engines::Maxwell3D::DirtyState::Flags* flags;+ Tegra::Engines::Maxwell3D::DirtyState::Flags default_flags;Tegra::Engines::Maxwell3D::DirtyState::Flags invalidation_flags;Maxwell::PrimitiveTopology current_topology = INVALID_TOPOLOGY;};