mirror of
https://github.com/doitsujin/dxvk.git
synced 2025-02-20 19:54:19 +01:00
[d3d9,dxvk,util] Actually use dxvk::mutex
This commit is contained in:
parent
2356d34f2e
commit
81440340ac
@ -2,8 +2,11 @@
|
||||
|
||||
#include "d3d9_device.h"
|
||||
#include "d3d9_include.h"
|
||||
|
||||
#include "../dxvk/dxvk_annotation.h"
|
||||
|
||||
#include "../util/thread.h"
|
||||
|
||||
#include <atomic>
|
||||
#include <mutex>
|
||||
#include <vector>
|
||||
@ -43,7 +46,7 @@ namespace dxvk {
|
||||
|
||||
std::atomic<bool> m_shouldAnnotate;
|
||||
|
||||
std::mutex m_mutex;
|
||||
dxvk::mutex m_mutex;
|
||||
std::vector<IDXVKUserDefinedAnnotation*> m_annotations;
|
||||
|
||||
// Provide our own event depth as we
|
||||
|
@ -51,7 +51,7 @@ namespace dxvk {
|
||||
std::atomic<VkSampler> m_samplerHandle = { VK_NULL_HANDLE };
|
||||
std::atomic<VkBuffer> m_bufferHandle = { VK_NULL_HANDLE };
|
||||
|
||||
std::mutex m_mutex;
|
||||
dxvk::mutex m_mutex;
|
||||
Rc<DxvkSampler> m_sampler;
|
||||
Rc<DxvkBuffer> m_buffer;
|
||||
|
||||
|
@ -45,7 +45,7 @@ namespace dxvk {
|
||||
|
||||
static Sleep s_instance;
|
||||
|
||||
std::mutex m_mutex;
|
||||
dxvk::mutex m_mutex;
|
||||
std::atomic<bool> m_initialized = { false };
|
||||
|
||||
#ifdef _WIN32
|
||||
|
Loading…
x
Reference in New Issue
Block a user