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

Conor McCarthy cmccarthy at codeweavers.com
Tue Jun 29 22:04:52 CDT 2021


Signed-off-by: Conor McCarthy <cmccarthy at codeweavers.com>
---
 libs/vkd3d-shader/dxbc.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index a26581cc..ab8fff02 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -976,12 +976,11 @@ static void shader_sm5_read_dcl_resource_structured(struct vkd3d_shader_instruct
     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;
     resource->byte_stride = *tokens++;
     if (resource->byte_stride % 4)
         FIXME("Byte stride %u is not multiple of 4.\n", resource->byte_stride);
-    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_dcl_resource_raw(struct vkd3d_shader_instruction *ins,
-- 
2.31.1




More information about the wine-devel mailing list