Merge branch 'fix-headless-crash' into 'main'

sultim-t-nv · sultim-t-nv · commit c460b137d128 · 2025-07-01T08:27:31.000-07:00
[REMIX-4390] Fix a nullptr crash on output image copying in windowless toolkit CI tests

See merge request lightspeedrtx/dxvk-remix-nv!1575
diff --git a/src/dxvk/rtx_render/rtx_remix_api.cpp b/src/dxvk/rtx_render/rtx_remix_api.cpp
@@ -1266,7 +1266,9 @@ namespace {
       }
 
       assert(srcImage.ptr());
-      dxvk::RtxContext::blitImageHelper(ctx, srcImage, cDest, VkFilter::VK_FILTER_NEAREST);
+      if (srcImage.ptr()) {
+        dxvk::RtxContext::blitImageHelper(ctx, srcImage, cDest, VkFilter::VK_FILTER_NEAREST);
+      }
     });
 
 #pragma warning(pop)

Original file line number	Diff line number	Diff line change
`@@ -1266,7 +1266,9 @@ namespace {`
`1266`	`1266`	`}`
`1267`	`1267`
`1268`	`1268`	`assert(srcImage.ptr());`
`1269`		`- dxvk::RtxContext::blitImageHelper(ctx, srcImage, cDest, VkFilter::VK_FILTER_NEAREST);`
	`1269`	`+ if (srcImage.ptr()) {`
	`1270`	`+ dxvk::RtxContext::blitImageHelper(ctx, srcImage, cDest, VkFilter::VK_FILTER_NEAREST);`
	`1271`	`+ }`
`1270`	`1272`	`});`
`1271`	`1273`
`1272`	`1274`	`#pragma warning(pop)`