[PATCH vkd3d 1/6] vkd3d-shader: Rename name_offset to name_bytecode_offset.

Zebediah Figura zfigura at codeweavers.com
Tue Apr 20 23:28:56 CDT 2021


Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
 libs/vkd3d-shader/hlsl.h         | 4 ++--
 libs/vkd3d-shader/hlsl_codegen.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index 3dc7a26b..0c755f46 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -136,9 +136,9 @@ struct hlsl_struct_field
     struct hlsl_type *type;
     const char *name;
     const char *semantic;
-
     unsigned int reg_offset;
-    unsigned int name_offset;
+
+    unsigned int name_bytecode_offset;
 };
 
 struct hlsl_reg
diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 1b5e8a27..2c07171b 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -1051,7 +1051,7 @@ static void write_sm1_type(struct bytecode_buffer *buffer, struct hlsl_type *typ
     {
         LIST_FOR_EACH_ENTRY(field, array_type->e.elements, struct hlsl_struct_field, entry)
         {
-            field->name_offset = buffer->count;
+            field->name_bytecode_offset = buffer->count;
             put_string(buffer, field->name);
             write_sm1_type(buffer, field->type, ctab_start);
         }
@@ -1060,7 +1060,7 @@ static void write_sm1_type(struct bytecode_buffer *buffer, struct hlsl_type *typ
 
         LIST_FOR_EACH_ENTRY(field, array_type->e.elements, struct hlsl_struct_field, entry)
         {
-            put_dword(buffer, (field->name_offset - ctab_start) * sizeof(*buffer->data));
+            put_dword(buffer, (field->name_bytecode_offset - ctab_start) * sizeof(*buffer->data));
             put_dword(buffer, (field->type->bytecode_offset - ctab_start) * sizeof(*buffer->data));
             ++field_count;
         }
-- 
2.31.1




More information about the wine-devel mailing list