Zebediah Figura : vkd3d-shader: Read constant buffer offsets from the second index.

[Alexandre Julliard]

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

Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date:   Wed May 27 14:15:30 2020 -0500

vkd3d-shader: Read constant buffer offsets from the second index.

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 libs/vkd3d-shader/dxbc.c  | 10 +++++++++-
 libs/vkd3d-shader/spirv.c |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index 5156074..de6aea3 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -646,7 +646,7 @@ static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction
     if (opcode_token & VKD3D_SM4_INDEX_TYPE_MASK)
         ins->flags |= VKD3DSI_INDEXED_DYNAMIC;
 
-    ins->declaration.cb.size = ins->declaration.cb.src.reg.idx[1].offset;
+    ins->declaration.cb.size = ins->declaration.cb.src.reg.idx[2].offset;
     ins->declaration.cb.register_space = 0;
 
     if (shader_is_sm_5_1(priv))
@@ -1603,6 +1603,14 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr
                 break;
         }
     }
+    else if (register_type == VKD3D_SM4_RT_CONSTBUFFER && order == 2)
+    {
+        /* SM5.1 places the buffer offset in idx[2]; earlier versions place it
+         * in idx[1]. Normalize to SM5.1. */
+        param->idx[2] = param->idx[1];
+        param->idx[1].rel_addr = NULL;
+        param->idx[1].offset = 0;
+    }
 
     map_register(priv, param);
 
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 0d4812b..a3cc5f9 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -2832,7 +2832,7 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp
     {
         assert(!reg->idx[0].rel_addr);
         indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_info->member_idx);
-        indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, ®->idx[1]);
+        indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, ®->idx[2]);
     }
     else if (reg->type == VKD3DSPR_IMMCONSTBUFFER)
     {