src/d3d9/d3d9_annotation.cpp

@@ -127,7 +127,6 @@ namespace dxvk {
   INT STDMETHODCALLTYPE D3D9UserDefinedAnnotation::BeginEvent(
           D3DCOLOR                Color,
           LPCWSTR                 Name) {
-    D3D9DeviceLock lock = m_container->LockDevice();
     m_container->EmitCs([color = Color, labelName = dxvk::str::fromws(Name)](DxvkContext *ctx) {
       VkDebugUtilsLabelEXT label;
       label.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT;
@@ -144,7 +143,6 @@ namespace dxvk {
 
 
   INT STDMETHODCALLTYPE D3D9UserDefinedAnnotation::EndEvent() {
-    D3D9DeviceLock lock = m_container->LockDevice();
     m_container->EmitCs([](DxvkContext *ctx) {
       ctx->endDebugLabel();
     });
@@ -157,7 +155,6 @@ namespace dxvk {
   void STDMETHODCALLTYPE D3D9UserDefinedAnnotation::SetMarker(
           D3DCOLOR                Color,
           LPCWSTR                 Name) {
-    D3D9DeviceLock lock = m_container->LockDevice();
     m_container->EmitCs([color = Color, labelName = dxvk::str::fromws(Name)](DxvkContext *ctx) {
       VkDebugUtilsLabelEXT label;
       label.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_LABEL_EXT;

src/d3d9/d3d9_interface.cpp

@@ -418,19 +418,11 @@ namespace dxvk {
       // can not be higher than D3DSWAPEFFECT_FLIPEX.
       if (unlikely(pPresentationParameters->SwapEffect > D3DSWAPEFFECT_FLIPEX))
         return D3DERR_INVALIDCALL;
-
-      // 30 is the highest supported back buffer count for Ex devices.
-      if (unlikely(pPresentationParameters->BackBufferCount > D3DPRESENT_BACK_BUFFERS_MAX_EX))
-        return D3DERR_INVALIDCALL;
     } else {
       // The swap effect value on a non-Ex D3D9 device
       // can not be higher than D3DSWAPEFFECT_COPY.
       if (unlikely(pPresentationParameters->SwapEffect > D3DSWAPEFFECT_COPY))
         return D3DERR_INVALIDCALL;
-
-      // 3 is the highest supported back buffer count for non-Ex devices.
-      if (unlikely(pPresentationParameters->BackBufferCount > D3DPRESENT_BACK_BUFFERS_MAX))
-        return D3DERR_INVALIDCALL;
     }
 
     // The swap effect value can not be 0.
@@ -446,6 +438,10 @@ namespace dxvk {
               && pPresentationParameters->BackBufferCount > 1))
       return D3DERR_INVALIDCALL;
 
+    // 3 is the highest supported back buffer count.
+    if (unlikely(pPresentationParameters->BackBufferCount > 3))
+      return D3DERR_INVALIDCALL;
+
     // Valid fullscreen presentation intervals must be known values.
     if (unlikely(!pPresentationParameters->Windowed
             && !(pPresentationParameters->PresentationInterval == D3DPRESENT_INTERVAL_DEFAULT