[d3d9,dxvk,util] Actually use dxvk::mutex

src/d3d9/d3d9_annotation.h

@@ -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

src/dxvk/dxvk_unbound.h

@@ -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;
     

src/util/util_sleep.h

@@ -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