dx12 fix for when video queue couldn't be created

turanszkij · Mar 7, 2024 · ae86e8b · ae86e8b
1 parent 303d49c
commit ae86e8b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/WickedEngine/wiGraphicsDevice_DX12.cpp b/WickedEngine/wiGraphicsDevice_DX12.cpp
@@ -2526,7 +2526,6 @@ using namespace dx12_internal;
 			}
 		}
 
-
 		if (SUCCEEDED(device.As(&video_device)))
 		{
 			queues[QUEUE_VIDEO_DECODE].desc.Type = D3D12_COMMAND_LIST_TYPE_VIDEO_DECODE;
@@ -5345,6 +5344,8 @@ using namespace dx12_internal;
 			for (int q = 0; q < QUEUE_COUNT; ++q)
 			{
 				CommandQueue& queue = queues[q];
+				if (queue.queue == nullptr)
+					continue;
 
 				if (!queue.submit_cmds.empty())
 				{
@@ -5413,6 +5414,8 @@ using namespace dx12_internal;
 		const uint32_t bufferindex = GetBufferIndex();
 		for (int queue = 0; queue < QUEUE_COUNT; ++queue)
 		{
+			if (queues[queue].queue == nullptr)
+				continue;
 			if (FRAMECOUNT >= BUFFERCOUNT && frame_fence[bufferindex][queue]->GetCompletedValue() < 1)
 			{
 				// NULL event handle will simply wait immediately:
@@ -5663,6 +5666,8 @@ using namespace dx12_internal;
 
 		for (auto& queue : queues)
 		{
+			if (queue.queue == nullptr)
+				continue;
 			hr = queue.queue->Signal(fence.Get(), 1);
 			assert(SUCCEEDED(hr));
 			if (fence->GetCompletedValue() < 1)

diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp
@@ -9,7 +9,7 @@ namespace wi::version
 	// minor features, major updates, breaking compatibility changes
 	const int minor = 71;
 	// minor bug fixes, alterations, refactors, updates
-	const int revision = 392;
+	const int revision = 393;
 
 	const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);