Philip Rebohle : vkd3d-shader: Don't shift output array component write mask.

Alexandre Julliard julliard at winehq.org
Tue Oct 22 12:22:17 CDT 2019


Module: vkd3d
Branch: master
Commit: 907d733ffe18635e17338a89edbc3b4947188de6
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=907d733ffe18635e17338a89edbc3b4947188de6

Author: Philip Rebohle <philip.rebohle at tu-dortmund.de>
Date:   Wed Oct 16 21:55:35 2019 +0200

vkd3d-shader: Don't shift output array component write mask.

Fixes an assertion when compiling shaders with more than four
clip or cull distances. Output arrays are arrays of scalars,
so shifting the write mask is not very meaningful.

Signed-off-by: Philip Rebohle <philip.rebohle at tu-dortmund.de>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 libs/vkd3d-shader/spirv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 75a3a4f..4b93e01 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -4536,7 +4536,7 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi
                 ptr_type_id, output_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, index));
         object_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, val_id,
                 write_mask, output_info->component_type, VKD3D_NO_SWIZZLE, VKD3DSP_WRITEMASK_0 << i);
-        vkd3d_dxbc_compiler_emit_store(compiler, chain_id, VKD3DSP_WRITEMASK_0 << index,
+        vkd3d_dxbc_compiler_emit_store(compiler, chain_id, VKD3DSP_WRITEMASK_0,
                 output_info->component_type, SpvStorageClassOutput, VKD3DSP_WRITEMASK_0 << i, object_id);
         ++index;
     }




More information about the wine-cvs mailing list