Synchronize changes from 1.6 branch [ci skip]

github-actions[bot] · github-actions[bot] · commit 1dc81c66933e · 2025-09-29T14:41:41.000Z
9ed7423 Addendum to 9a6bac7
diff --git a/Client/core/Graphics/CRenderItemManager.cpp b/Client/core/Graphics/CRenderItemManager.cpp
@@ -64,13 +64,9 @@ HRESULT CRenderItemManager::GetDeviceCooperativeLevel(const char* szContext, boo
     if (hrCoopLevel == D3D_OK)
         return hrCoopLevel;
 
-    if (bLogLost)
+    if (bLogLost) // Expand (without log spam) later
     {
-        const char* szContextLabel = szContext ? szContext : "DeviceCheck";
-        if (hrCoopLevel == D3DERR_DEVICELOST || hrCoopLevel == D3DERR_DEVICENOTRESET)
-            WriteDebugEvent(SString("CRenderItemManager::%s skipped due to device state: %08x", szContextLabel, hrCoopLevel));
-        else
-            WriteDebugEvent(SString("CRenderItemManager::%s unexpected cooperative level: %08x", szContextLabel, hrCoopLevel));
+        (void)szContext;
     }
 
     return hrCoopLevel;

Original file line number	Diff line number	Diff line change
`@@ -64,13 +64,9 @@ HRESULT CRenderItemManager::GetDeviceCooperativeLevel(const char* szContext, boo`
`64`	`64`	`if (hrCoopLevel == D3D_OK)`
`65`	`65`	`return hrCoopLevel;`
`66`	`66`
`67`		`- if (bLogLost)`
	`67`	`+ if (bLogLost) // Expand (without log spam) later`
`68`	`68`	`{`
`69`		`- const char* szContextLabel = szContext ? szContext : "DeviceCheck";`
`70`		`- if (hrCoopLevel == D3DERR_DEVICELOST \|\| hrCoopLevel == D3DERR_DEVICENOTRESET)`
`71`		`- WriteDebugEvent(SString("CRenderItemManager::%s skipped due to device state: %08x", szContextLabel, hrCoopLevel));`
`72`		`- else`
`73`		`- WriteDebugEvent(SString("CRenderItemManager::%s unexpected cooperative level: %08x", szContextLabel, hrCoopLevel));`
	`69`	`+ (void)szContext;`
`74`	`70`	`}`
`75`	`71`
`76`	`72`	`return hrCoopLevel;`