ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11625 from phire/eventhook_nodiscard 

Fix KillRenderer config changed regression
This commit is contained in:
Scott Mansell 2023-03-06 03:09:12 +13:00 committed by GitHub
parent cecf2d25d6 901f12c935
commit 4acdbc0e84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/HookableEvent.h
View File

@ -91,7 +91,7 @@ private:
public: public:
// Returns a handle that will unregister the listener when destroyed. // Returns a handle that will unregister the listener when destroyed.
static EventHook Register(CallbackType callback, std::string name) [[nodiscard]] static EventHook Register(CallbackType callback, std::string name)
{ {
auto& storage = GetStorage(); auto& storage = GetStorage();
std::lock_guard lock(storage.m_mutex); std::lock_guard lock(storage.m_mutex);

3
Source/Core/VideoCommon/AbstractGfx.cpp
View File

@ -18,7 +18,8 @@ std::unique_ptr<AbstractGfx> g_gfx;
AbstractGfx::AbstractGfx() AbstractGfx::AbstractGfx()
{ {
ConfigChangedEvent::Register([this](u32 bits) { OnConfigChanged(bits); }, "AbstractGfx"); m_config_changed =
ConfigChangedEvent::Register([this](u32 bits) { OnConfigChanged(bits); }, "AbstractGfx");
} }
bool AbstractGfx::IsHeadless() const bool AbstractGfx::IsHeadless() const

4
Source/Core/VideoCommon/AbstractGfx.h
View File

@ -3,6 +3,7 @@
#pragma once #pragma once
#include "Common/HookableEvent.h"
#include "Common/MathUtil.h" #include "Common/MathUtil.h"
#include "VideoCommon/RenderState.h" #include "VideoCommon/RenderState.h"
@ -166,6 +167,9 @@ public:
protected: protected:
AbstractFramebuffer* m_current_framebuffer = nullptr; AbstractFramebuffer* m_current_framebuffer = nullptr;
const AbstractPipeline* m_current_pipeline = nullptr; const AbstractPipeline* m_current_pipeline = nullptr;
private:
Common::EventHook m_config_changed;
}; };
extern std::unique_ptr<AbstractGfx> g_gfx; extern std::unique_ptr<AbstractGfx> g_gfx;