[PATCH vkd3d v2 7/7] vkd3d-shader: Call shader_sm4_set_descriptor_register_range() for raw resources.
Conor McCarthy
cmccarthy at codeweavers.com
Wed Jun 30 23:24:53 CDT 2021
Signed-off-by: Conor McCarthy <cmccarthy at codeweavers.com>
---
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 3f1c7de4..2ec2bcac 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);
}
--
2.31.1
More information about the wine-devel
mailing list