Henri Verbeet : vkd3d-shader: Get rid of the "ptr" field from struct vkd3d_shader_parser.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 09566e2c251625ec895a578450727f05793969ef
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/09566e2c251625ec895a578450727f...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Wed Apr 12 12:16:07 2023 +0200

vkd3d-shader: Get rid of the "ptr" field from struct vkd3d_shader_parser.

This is an implementation detail.

---

 libs/vkd3d-shader/d3dbc.c                | 10 +++++-----
 libs/vkd3d-shader/dxbc.c                 |  8 ++++----
 libs/vkd3d-shader/vkd3d_shader_private.h |  1 -
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c
index ed81137d..64d1aaba 100644
--- a/libs/vkd3d-shader/d3dbc.c
+++ b/libs/vkd3d-shader/d3dbc.c
@@ -207,7 +207,7 @@ struct vkd3d_sm1_opcode_info
 struct vkd3d_shader_sm1_parser
 {
     const struct vkd3d_sm1_opcode_info *opcode_table;
-    const uint32_t *start, *end;
+    const uint32_t *start, *end, *ptr;
     bool abort;
 
     struct vkd3d_shader_parser p;
@@ -671,7 +671,7 @@ static void shader_sm1_read_immconst(struct vkd3d_shader_sm1_parser *sm1, const
 
 static void shader_sm1_read_comment(struct vkd3d_shader_sm1_parser *sm1)
 {
-    const uint32_t **ptr = &sm1->p.ptr;
+    const uint32_t **ptr = &sm1->ptr;
     const char *comment;
     unsigned int size;
     size_t remaining;
@@ -744,7 +744,7 @@ static void shader_sm1_read_instruction(struct vkd3d_shader_parser *parser, stru
     struct vkd3d_shader_src_param *src_params, *predicate;
     const struct vkd3d_sm1_opcode_info *opcode_info;
     struct vkd3d_shader_dst_param *dst_param;
-    const uint32_t **ptr = &parser->ptr;
+    const uint32_t **ptr = &sm1->ptr;
     uint32_t opcode_token;
     const uint32_t *p;
     bool predicated;
@@ -855,7 +855,7 @@ fail:
 static bool shader_sm1_is_end(struct vkd3d_shader_parser *parser)
 {
     struct vkd3d_shader_sm1_parser *sm1 = vkd3d_shader_sm1_parser(parser);
-    const uint32_t **ptr = &parser->ptr;
+    const uint32_t **ptr = &sm1->ptr;
 
     shader_sm1_read_comment(sm1);
 
@@ -938,7 +938,7 @@ static enum vkd3d_result shader_sm1_init(struct vkd3d_shader_sm1_parser *sm1,
     shader_desc = &sm1->p.shader_desc;
     shader_desc->byte_code = code;
     shader_desc->byte_code_size = code_size;
-    sm1->p.ptr = sm1->start;
+    sm1->ptr = sm1->start;
 
     return VKD3D_OK;
 }
diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index f32af8ea..668e9768 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -103,7 +103,7 @@ struct vkd3d_shader_src_param_entry
 
 struct vkd3d_shader_sm4_parser
 {
-    const uint32_t *start, *end;
+    const uint32_t *start, *end, *ptr;
 
     unsigned int output_map[MAX_REG_OUTPUT];
 
@@ -1466,7 +1466,7 @@ static void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, stru
     uint32_t opcode_token, opcode, previous_token;
     struct vkd3d_shader_dst_param *dst_params;
     struct vkd3d_shader_src_param *src_params;
-    const uint32_t **ptr = &parser->ptr;
+    const uint32_t **ptr = &sm4->ptr;
     unsigned int i, len;
     size_t remaining;
     const uint32_t *p;
@@ -1601,7 +1601,7 @@ static bool shader_sm4_is_end(struct vkd3d_shader_parser *parser)
 {
     struct vkd3d_shader_sm4_parser *sm4 = vkd3d_shader_sm4_parser(parser);
 
-    return parser->ptr == sm4->end;
+    return sm4->ptr == sm4->end;
 }
 
 static const struct vkd3d_shader_parser_ops shader_sm4_parser_ops =
@@ -1673,7 +1673,7 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t
     if (!vkd3d_shader_parser_init(&sm4->p, message_context, source_name, &version, &shader_sm4_parser_ops,
             token_count / 7u + 20))
         return false;
-    sm4->p.ptr = sm4->start;
+    sm4->ptr = sm4->start;
 
     memset(sm4->output_map, 0xff, sizeof(sm4->output_map));
     for (i = 0; i < output_signature->element_count; ++i)
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 5d78089c..e635a70b 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -993,7 +993,6 @@ struct vkd3d_shader_parser
 
     struct vkd3d_shader_desc shader_desc;
     struct vkd3d_shader_version shader_version;
-    const uint32_t *ptr;
     const struct vkd3d_shader_parser_ops *ops;
     struct vkd3d_shader_instruction_array instructions;
 };