Skip to content

Commit b1d9f15

Browse files
committed
Moved g_vulkanActivityMutex to libscopehal
1 parent f35122d commit b1d9f15

3 files changed

Lines changed: 2 additions & 12 deletions

File tree

src/ngscopeclient/WaveformThread.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,6 @@ atomic<int64_t> g_lastWaveformRenderTime;
5454

5555
void RenderAllWaveforms(vk::raii::CommandBuffer& cmdbuf, Session* session, shared_ptr<QueueHandle> queue);
5656

57-
/**
58-
@brief Mutex for controlling access to background Vulkan activity
59-
60-
Arbitrarily many threads can own this mutex at once, but recreating the swapchain conflicts with any and all uses
61-
*/
62-
std::shared_mutex g_vulkanActivityMutex;
63-
6457
void WaveformThread(Session* session, atomic<bool>* shuttingDown)
6558
{
6659
pthread_setname_np_compat("WaveformThread");

src/ngscopeclient/ngscopeclient.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* *
33
* ngscopeclient *
44
* *
5-
* Copyright (c) 2012-2024 Andrew D. Zonenberg and contributors *
5+
* Copyright (c) 2012-2025 Andrew D. Zonenberg and contributors *
66
* All rights reserved. *
77
* *
88
* Redistribution and use in source and binary forms, with or without modification, are permitted provided that the *
@@ -43,7 +43,6 @@
4343
#include "ImGuiDisabler.h"
4444

4545
#include <atomic>
46-
#include <shared_mutex>
4746

4847
#include "BERTState.h"
4948
#include "PowerSupplyState.h"
@@ -80,8 +79,6 @@ void WaveformThread(Session* session, std::atomic<bool>* shuttingDown);
8079

8180
void RightJustifiedText(const std::string& str);
8281

83-
extern std::shared_mutex g_vulkanActivityMutex;
84-
8582
bool RectIntersect(ImVec2 posA, ImVec2 sizeA, ImVec2 posB, ImVec2 sizeB);
8683
bool RectContains(ImVec2 posA, ImVec2 sizeA, ImVec2 posB, ImVec2 sizeB);
8784

0 commit comments

Comments
 (0)