Mesa (master): vulkan: Remove GCC pragmas by fixing warnings

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 440952f152aaaadc3083cece34e5782c6c278781
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=440952f152aaaadc3083cece34e5782c6c278781

Author: James Park <jpark37 at lagfreegames.com>
Date:   Thu Nov 26 19:41:32 2020 -0800

vulkan: Remove GCC pragmas by fixing warnings

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7783>

---

 src/vulkan/util/gen_enum_to_str.py | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/vulkan/util/gen_enum_to_str.py b/src/vulkan/util/gen_enum_to_str.py
index ebaf2a1a0cc..4eb21c16823 100644
--- a/src/vulkan/util/gen_enum_to_str.py
+++ b/src/vulkan/util/gen_enum_to_str.py
@@ -71,16 +71,14 @@ C_TEMPLATE = Template(textwrap.dedent(u"""\
     const char *
     vk_${enum.name[2:]}_to_str(${enum.name} input)
     {
-        #pragma GCC diagnostic push
-        #pragma GCC diagnostic ignored "-Wswitch"
         switch(input) {
-        % for v in sorted(enum.values.keys()):
-            case ${v}:
-                return "${enum.values[v]}";
-        % endfor
+    % for v in sorted(enum.values.keys()):
+        case ${v}:
+            return "${enum.values[v]}";
+    % endfor
+        default:
+            unreachable("Undefined enum value.");
         }
-        #pragma GCC diagnostic pop
-        unreachable("Undefined enum value.");
     }
 
       % if enum.guard:
@@ -90,9 +88,7 @@ C_TEMPLATE = Template(textwrap.dedent(u"""\
 
     size_t vk_structure_type_size(const struct VkBaseInStructure *item)
     {
-        #pragma GCC diagnostic push
-        #pragma GCC diagnostic ignored "-Wswitch"
-        switch(item->sType) {
+        switch((int)item->sType) {
     % for struct in structs:
         % if struct.extension is not None and struct.extension.define is not None:
     #ifdef ${struct.extension.define}
@@ -102,9 +98,9 @@ C_TEMPLATE = Template(textwrap.dedent(u"""\
         case ${struct.stype}: return sizeof(${struct.name});
         % endif
     %endfor
+        default:
+            unreachable("Undefined struct type.");
         }
-        #pragma GCC diagnostic pop
-        unreachable("Undefined struct type.");
     }
 
     void vk_load_instance_commands(VkInstance instance,