[PATCH vkd3d 02/11] vkd3d-shader: Fix swizzle for scalars.

Józef Kucia joseph.kucia at gmail.com
Thu Feb 21 05:32:47 CST 2019


From: Józef Kucia <jkucia at codeweavers.com>

In rare cases, OpCompositeExtract was generated for scalars.

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
 libs/vkd3d-shader/spirv.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 2b52334dc5e4..6ef04a4bd747 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -2661,6 +2661,9 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle_ext(struct vkd3d_dxbc_compiler
 
     type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count);
 
+    if (component_count == 1 && val_component_count == 1)
+        return val_id;
+
     if (component_count == 1)
     {
         component_idx = vkd3d_write_mask_get_component_idx(write_mask);
-- 
2.19.2




More information about the wine-devel mailing list