Merge branch 'dev/lvengesanam/resolve_issue_with_queue_synchronization' into 'main'

lvengesanam · lvengesanam · commit e8b8fd3c1e88 · 2025-03-11T10:41:56.000-07:00
[REMIX-3876] Correcting data queue access associated with SetSoftwareVertexProcessing API call

See merge request lightspeedrtx/bridge-remix-nv!147
diff --git a/src/client/d3d9_device.cpp b/src/client/d3d9_device.cpp
@@ -2272,6 +2272,8 @@ HRESULT Direct3DDevice9Ex_LSS<EnableSync>::SetSoftwareVertexProcessing(BOOL bSof
   LogFunctionCall();
   {
     BRIDGE_DEVICE_LOCKGUARD();
+    if (m_bSoftwareVtxProcessing == bSoftware)
+      return D3D_OK;
     m_bSoftwareVtxProcessing = bSoftware;
   }
   UID currentUID = 0;
@@ -2283,6 +2285,8 @@ HRESULT Direct3DDevice9Ex_LSS<EnableSync>::SetSoftwareVertexProcessing(BOOL bSof
   WAIT_FOR_SERVER_RESPONSE("SetSoftwareVertexProcessing()", D3DERR_INVALIDCALL, currentUID);
 
   HRESULT hresult = DeviceBridge::get_data();
+  DeviceBridge::pop_front();
+
   return hresult;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2272,6 +2272,8 @@ HRESULT Direct3DDevice9Ex_LSS<EnableSync>::SetSoftwareVertexProcessing(BOOL bSof`
`2272`	`2272`	`LogFunctionCall();`
`2273`	`2273`	`{`
`2274`	`2274`	`BRIDGE_DEVICE_LOCKGUARD();`
	`2275`	`+ if (m_bSoftwareVtxProcessing == bSoftware)`
	`2276`	`+ return D3D_OK;`
`2275`	`2277`	`m_bSoftwareVtxProcessing = bSoftware;`
`2276`	`2278`	`}`
`2277`	`2279`	`UID currentUID = 0;`
`@@ -2283,6 +2285,8 @@ HRESULT Direct3DDevice9Ex_LSS<EnableSync>::SetSoftwareVertexProcessing(BOOL bSof`
`2283`	`2285`	`WAIT_FOR_SERVER_RESPONSE("SetSoftwareVertexProcessing()", D3DERR_INVALIDCALL, currentUID);`
`2284`	`2286`
`2285`	`2287`	`HRESULT hresult = DeviceBridge::get_data();`
	`2288`	`+ DeviceBridge::pop_front();`
	`2289`	`+`
`2286`	`2290`	`return hresult;`
`2287`	`2291`	`}`
`2288`	`2292`