[PATCH vkd3d 2/8] vkd3d-shader: Read constant buffer offsets from the second index for SM5.1.

[Zebediah Figura]

Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
 libs/vkd3d-shader/dxbc.c                 | 4 ++++
 libs/vkd3d-shader/spirv.c                | 2 +-
 libs/vkd3d-shader/vkd3d_shader_private.h | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index 6d0d995..298132d 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -1600,6 +1600,10 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr
                 break;
         }
     }
+    else if (register_type == VKD3D_SM4_RT_CONSTBUFFER)
+    {
+        param->u.cb_offset_param = shader_is_sm_5_1(priv) ? 2 : 1;
+    }
 
     map_register(priv, param);
 
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index a8b2a50..2b5853f 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, &reg->idx[1]);
+        indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[reg->u.cb_offset_param]);
     }
     else if (reg->type == VKD3DSPR_IMMCONSTBUFFER)
     {
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 9157a5a..36db3bb 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -566,6 +566,7 @@ struct vkd3d_shader_register
         float immconst_float[VKD3D_VEC4_SIZE];
         unsigned fp_body_idx;
         unsigned int resource_idx;
+        unsigned int cb_offset_param;
     } u;
 };
 
-- 
2.26.2