mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-01-29 01:38:24 +00:00
Fix showing debug menu bar / Devtools (#2214)
Some checks are pending
Build and Release / reuse (push) Waiting to run
Build and Release / clang-format (push) Waiting to run
Build and Release / get-info (push) Waiting to run
Build and Release / windows-sdl (push) Blocked by required conditions
Build and Release / macos-sdl (push) Blocked by required conditions
Build and Release / macos-qt (push) Blocked by required conditions
Build and Release / linux-sdl (push) Blocked by required conditions
Build and Release / linux-qt (push) Blocked by required conditions
Build and Release / linux-sdl-gcc (push) Blocked by required conditions
Build and Release / linux-qt-gcc (push) Blocked by required conditions
Build and Release / pre-release (push) Blocked by required conditions
Build and Release / windows-qt (push) Blocked by required conditions
Some checks are pending
Build and Release / reuse (push) Waiting to run
Build and Release / clang-format (push) Waiting to run
Build and Release / get-info (push) Waiting to run
Build and Release / windows-sdl (push) Blocked by required conditions
Build and Release / macos-sdl (push) Blocked by required conditions
Build and Release / macos-qt (push) Blocked by required conditions
Build and Release / linux-sdl (push) Blocked by required conditions
Build and Release / linux-qt (push) Blocked by required conditions
Build and Release / linux-sdl-gcc (push) Blocked by required conditions
Build and Release / linux-qt-gcc (push) Blocked by required conditions
Build and Release / pre-release (push) Blocked by required conditions
Build and Release / windows-qt (push) Blocked by required conditions
* Fix showing debug menu bar / Devtools * Fix
This commit is contained in:
parent
81e7e4b216
commit
cc2e13873f
|
@ -17,6 +17,8 @@ using namespace DebugStateType;
|
||||||
|
|
||||||
DebugStateImpl& DebugState = *Common::Singleton<DebugStateImpl>::Instance();
|
DebugStateImpl& DebugState = *Common::Singleton<DebugStateImpl>::Instance();
|
||||||
|
|
||||||
|
bool DebugStateType::showing_debug_menu_bar = false;
|
||||||
|
|
||||||
static ThreadID ThisThreadID() {
|
static ThreadID ThisThreadID() {
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
return GetCurrentThreadId();
|
return GetCurrentThreadId();
|
||||||
|
|
|
@ -35,6 +35,8 @@ class ShaderList;
|
||||||
|
|
||||||
namespace DebugStateType {
|
namespace DebugStateType {
|
||||||
|
|
||||||
|
extern bool showing_debug_menu_bar;
|
||||||
|
|
||||||
enum class QueueType {
|
enum class QueueType {
|
||||||
dcb = 0,
|
dcb = 0,
|
||||||
ccb = 1,
|
ccb = 1,
|
||||||
|
@ -131,8 +133,6 @@ class DebugStateImpl {
|
||||||
friend class Core::Devtools::Widget::FrameGraph;
|
friend class Core::Devtools::Widget::FrameGraph;
|
||||||
friend class Core::Devtools::Widget::ShaderList;
|
friend class Core::Devtools::Widget::ShaderList;
|
||||||
|
|
||||||
bool showing_debug_menu_bar = false;
|
|
||||||
|
|
||||||
std::queue<std::string> debug_message_popup;
|
std::queue<std::string> debug_message_popup;
|
||||||
|
|
||||||
std::mutex guest_threads_mutex{};
|
std::mutex guest_threads_mutex{};
|
||||||
|
|
Loading…
Reference in a new issue