[PATCH vkd3d] vkd3d: Only disable raster based on SO stream if SO is used.

Conor McCarthy cmccarthy at codeweavers.com
Wed Sep 29 23:50:38 CDT 2021


Fixes the black screen problem in Diablo 2: Resurrected.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51105

From: Robin Kertels <robin.kertels at gmail.com>
Signed-off-by: Conor McCarthy <cmccarthy at codeweavers.com>
---
 libs/vkd3d/command.c | 2 +-
 libs/vkd3d/state.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index 9f4a4149..186e4370 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -6065,7 +6065,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *if
         }
         else
         {
-            FIXME("Failed to acquire Vulkan semaphore for fence %p, value %#"PRIx64
+            FIXME_ONCE("Failed to acquire Vulkan semaphore for fence %p, value %#"PRIx64
                     ", completed value %#"PRIx64".\n", fence, value, completed_value);
         }
 
diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c
index 9e554b44..73c78d06 100644
--- a/libs/vkd3d/state.c
+++ b/libs/vkd3d/state.c
@@ -2629,7 +2629,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s
     rs_desc_from_d3d12(&graphics->rs_desc, &desc->RasterizerState);
     have_attachment = graphics->rt_count || graphics->dsv_format || is_dsv_format_unknown;
     if ((!have_attachment && !(desc->PS.pShaderBytecode && desc->PS.BytecodeLength))
-            || so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM)
+            || (so_desc->NumEntries != 0 && so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM))
         graphics->rs_desc.rasterizerDiscardEnable = VK_TRUE;
 
     rs_stream_info_from_d3d12(&graphics->rs_stream_info, &graphics->rs_desc, so_desc, vk_info);
-- 
2.32.0




More information about the wine-devel mailing list