Conor McCarthy : vkd3d-shader: Call shader_sm4_set_descriptor_register_range() for raw resources.

[Alexandre Julliard]

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

Author: Conor McCarthy <cmccarthy(a)codeweavers.com>
Date:   Thu Jul  1 14:24:53 2021 +1000

vkd3d-shader: Call shader_sm4_set_descriptor_register_range() for raw resources.

Signed-off-by: Conor McCarthy <cmccarthy(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 | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index 3f1c7de..2ec2bca 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_set_descriptor_register_range(struct vkd3d_sm4_data *priv,
         struct vkd3d_shader_register *reg, struct vkd3d_shader_register_range *range)
 {
@@ -991,8 +983,7 @@ 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_set_descriptor_register_range(priv, &resource->resource.reg.reg, &resource->resource.range);
     shader_sm4_read_register_space(priv, &tokens, end, &resource->resource.range.space);
 }