[PATCH vkd3d 7/7] vkd3d-shader: Call shader_sm4_read_descriptor_register_range() for raw resources.

[Conor McCarthy]

Signed-off-by: Conor McCarthy 
---
 libs/vkd3d-shader/dxbc.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index ab8fff02..ce4cecff 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -622,14 +622,6 @@ static void shader_sm4_read_shader_data(struct vkd3d_shader_instruction *ins,
     ins->declaration.icb = &priv->icb;
 }

-static unsigned int shader_sm4_map_resource_idx(struct vkd3d_shader_register *reg, const struct vkd3d_sm4_data *priv)
-{
-    if (shader_is_sm_5_1(priv))
-        return reg->idx[1].offset;
-    else
-        return reg->idx[0].offset;
-}
-
 static void shader_sm4_read_descriptor_register_range(struct vkd3d_sm4_data *priv, const DWORD **ptr,
         const DWORD *end, struct vkd3d_shader_register *reg, struct vkd3d_shader_register_range *range)
 {
@@ -991,9 +983,8 @@ static void shader_sm5_read_dcl_resource_raw(struct vkd3d_shader_instruction *in
     const DWORD *end = &tokens[token_count];

shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &resource->resource.reg);
-    resource->resource.range.first = shader_sm4_map_resource_idx(&resource->resource.reg.reg, priv);
-    resource->resource.range.last = resource->resource.range.first;
-    shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.range.space);
+    shader_sm4_read_descriptor_register_range(priv, &tokens, end,
+            &resource->resource.reg.reg, &resource->resource.range);
 }

static void shader_sm5_read_sync(struct vkd3d_shader_instruction *ins,