=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: libs/vkd3d-shader: Enable arrayed inputs for all shader types.

Alexandre Julliard julliard at winehq.org
Wed Jul 18 10:57:18 CDT 2018


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

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Wed Jul 18 12:05:41 2018 +0200

libs/vkd3d-shader: Enable arrayed inputs for all shader types.

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 libs/vkd3d-shader/spirv.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index bfa2bc0..1755c25 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -3000,11 +3000,6 @@ static const struct vkd3d_shader_signature_element *vkd3d_find_signature_element
     return NULL;
 }
 
-static bool vkd3d_dxbc_compiler_is_input_arrayed(struct vkd3d_dxbc_compiler *compiler)
-{
-    return compiler->shader_type == VKD3D_SHADER_TYPE_GEOMETRY;
-}
-
 static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compiler,
         const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval)
 {
@@ -3027,7 +3022,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi
     assert(!reg->idx[0].rel_addr);
     assert(!reg->idx[1].rel_addr);
 
-    if (vkd3d_dxbc_compiler_is_input_arrayed(compiler))
+    if (reg->idx[1].offset != ~0u)
     {
         array_size = reg->idx[0].offset;
         reg_idx = reg->idx[1].offset;




More information about the wine-cvs mailing list