Henri Verbeet : vkd3d-shader: Rename the "SHOW_BYTE_OFFSET" output formatting flag to just "OFFSETS".

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 8cc0abfca0ed7457f63f3f977c3049756177ef5b
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=8cc0abfca0ed7457f63f3f97...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Mon Sep 21 20:06:28 2020 +0330

vkd3d-shader: Rename the "SHOW_BYTE_OFFSET" output formatting flag to just "OFFSETS".

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 include/vkd3d_shader.h         | 2 +-
 libs/vkd3d-shader/spirv.c      | 2 +-
 programs/vkd3d-compiler/main.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index 376699f..624376d 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -78,7 +78,7 @@ enum vkd3d_shader_compile_option_formatting_flags
     VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NONE             = 0x00000000,
     VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR           = 0x00000001,
     VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT           = 0x00000002,
-    VKD3D_SHADER_COMPILE_OPTION_FORMATTING_SHOW_BYTE_OFFSET = 0x00000004,
+    VKD3D_SHADER_COMPILE_OPTION_FORMATTING_OFFSETS          = 0x00000004,
     VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NO_HEADER        = 0x00000008,
     VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES   = 0x00000010,
 
diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index fa0d4e0..33356d8 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -64,7 +64,7 @@ static uint32_t get_binary_to_text_options(enum vkd3d_shader_compile_option_form
     {
         {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR,           SPV_BINARY_TO_TEXT_OPTION_COLOR           },
         {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT,           SPV_BINARY_TO_TEXT_OPTION_INDENT          },
-        {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_SHOW_BYTE_OFFSET, SPV_BINARY_TO_TEXT_OPTION_SHOW_BYTE_OFFSET},
+        {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_OFFSETS,          SPV_BINARY_TO_TEXT_OPTION_SHOW_BYTE_OFFSET},
         {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NO_HEADER,        SPV_BINARY_TO_TEXT_OPTION_NO_HEADER       },
         {VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES,   SPV_BINARY_TO_TEXT_OPTION_FRIENDLY_NAMES  },
     };
diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c
index 4812d47..cc50866 100644
--- a/programs/vkd3d-compiler/main.c
+++ b/programs/vkd3d-compiler/main.c
@@ -149,7 +149,7 @@ static void print_usage(const char *program_name)
         "                        standard output.\n"
         "  --formatting=<type>   Specify the formatting options for text output.\n"
         "                        Valid values are 'none', 'print', 'colour', 'indent',\n"
-        "                        'show-byte-offset', 'no-header', and 'friendly-names'.\n"
+        "                        'offsets', 'no-header', and 'friendly-names'.\n"
         "                        Default is --formatting=friendly-names,indent.\n"
         "  --print-source-types  Display the supported source types and exit.\n"
         "  --print-target-types  Display the supported target types for the specified\n"
@@ -238,7 +238,7 @@ static bool parse_formatting(uint32_t *formatting, char *arg)
         {"none",             VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NONE            },
         {"colour",           VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR          },
         {"indent",           VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT          },
-        {"show-byte-offset", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_SHOW_BYTE_OFFSET},
+        {"offsets",          VKD3D_SHADER_COMPILE_OPTION_FORMATTING_OFFSETS         },
         {"no-header",        VKD3D_SHADER_COMPILE_OPTION_FORMATTING_NO_HEADER       },
         {"friendly-names",   VKD3D_SHADER_COMPILE_OPTION_FORMATTING_FRIENDLY_NAMES  },
     };