Merge pull request #165 from rpavlik/warning-fixes

Warning fixes

Author: rpavlik

changes/sdk/pr.165.gh.OpenXR-SDK-Source.md

@@ -0,0 +1 @@
+Silence some noisy warnings in hello_xr and the layers.

src/scripts/api_dump_generator.py

@@ -881,6 +881,8 @@ def writeApiDumpUnionStructFuncs(self):
             struct_union_check += '                          std::string prefix, std::string type_string, bool is_pointer,\n'
             struct_union_check += '                          std::vector<std::tuple<std::string, std::string, std::string>> &contents) {\n'
             struct_union_check += self.writeIndent(1)
+            struct_union_check += '(void)gen_dispatch_table;  // silence warning\n'
+            struct_union_check += self.writeIndent(1)
             struct_union_check += 'try {\n'
             struct_union_check += self.writeIndent(2)
             struct_union_check += 'contents.emplace_back(type_string, prefix, PointerToHexString(value));\n'
@@ -914,6 +916,8 @@ def writeApiDumpUnionStructFuncs(self):
             struct_union_check += '                           std::vector<std::tuple<std::string, std::string, std::string>> &contents) {\n'
             indent = 1
             struct_union_check += self.writeIndent(indent)
+            struct_union_check += '(void)gen_dispatch_table;  // silence warning\n'
+            struct_union_check += self.writeIndent(indent)
             struct_union_check += 'try {\n'
             indent = indent + 1
             is_relation_group = False
@@ -974,6 +978,8 @@ def writeApiDumpUnionStructFuncs(self):
             struct_union_check += '\n'
         struct_union_check += 'bool ApiDumpDecodeNextChain(XrGeneratedDispatchTable* gen_dispatch_table, const void* value, std::string prefix,\n'
         struct_union_check += '                            std::vector<std::tuple<std::string, std::string, std::string>> &contents) {\n'
+        struct_union_check += self.writeIndent(1)
+        struct_union_check += '(void)gen_dispatch_table;  // silence warning\n'
         struct_union_check += '    try {\n'
         struct_union_check += '        contents.emplace_back("const void *", prefix, PointerToHexString(value));\n'
         struct_union_check += '        if (nullptr == value) {\n'

src/scripts/validation_layer_generator.py

@@ -261,6 +261,16 @@ def outputValidationSourceEnumValues(self):
             enum_value_validate += '                    std::vector<GenValidUsageXrObjectInfo>& objects_info,\n'
             enum_value_validate += '                    const %s value) {\n' % enum_tuple.name
             indent = 1
+            enum_value_validate += self.writeIndent(indent)
+            enum_value_validate += '(void)instance_info;  // quiet warnings\n'
+            enum_value_validate += self.writeIndent(indent)
+            enum_value_validate += '(void)command_name;  // quiet warnings\n'
+            enum_value_validate += self.writeIndent(indent)
+            enum_value_validate += '(void)validation_name;  // quiet warnings\n'
+            enum_value_validate += self.writeIndent(indent)
+            enum_value_validate += '(void)item_name;  // quiet warnings\n'
+            enum_value_validate += self.writeIndent(indent)
+            enum_value_validate += '(void)objects_info;  // quiet warnings\n'
             checked_extension = ''
             if enum_tuple.ext_name and not self.isCoreExtensionName(enum_tuple.ext_name):
                 checked_extension = enum_tuple.ext_name
@@ -2157,8 +2167,13 @@ def genValidateInputsFunc(self, cur_command):
                 pre_validate_func += self.writeIndent(indent)
                 pre_validate_func += 'GenValidUsageXrHandleInfo *gen_%s_info = info_with_instance.first;\n' % undecorate(first_param_tuple.name)
                 pre_validate_func += self.writeIndent(indent)
+                pre_validate_func += '(void)gen_%s_info;  // quiet warnings\n' % undecorate(first_param_tuple.name)
+                pre_validate_func += self.writeIndent(indent)
                 pre_validate_func += 'GenValidUsageXrInstanceInfo *gen_instance_info = info_with_instance.second;\n'
 
+            pre_validate_func += self.writeIndent(indent)
+            pre_validate_func += '(void)gen_instance_info;  // quiet warnings\n'
+
         # If any of the associated handles has validation state tracking, get the
         # appropriate struct setup for validation later in the function
         valid_type_list = []
@@ -2401,6 +2416,7 @@ def genNextValidateFunc(self, cur_command, has_return, is_create, is_destroy, is
                 next_validate_func += '        auto info_with_instance = %s.getWithInstanceInfo(%s);\n' % (
                     self.makeInfoName(handle_type_name=first_handle_tuple.name), first_handle_name)
                 next_validate_func += '        GenValidUsageXrHandleInfo *gen_%s_info = info_with_instance.first;\n' % base_handle_name
+                next_validate_func += '        (void)gen_%s_info;  // quiet warnings\n' % base_handle_name
                 next_validate_func += '        GenValidUsageXrInstanceInfo *gen_instance_info = info_with_instance.second;\n'
         else:
             next_validate_func += '#error("Bug")\n'

src/tests/hello_xr/common.h

@@ -43,10 +43,10 @@ template <typename T>
 struct ScopeGuard {
     // Needs C++17: static_assert(std::is_invocable_v<T>, "Type must be invocable function.");
 
-    ScopeGuard(T&& guard) : m_guard(std::move(guard)) {}
+    ScopeGuard(T&& guard) noexcept : m_guard(std::move(guard)) {}
 
-    ScopeGuard(ScopeGuard&&) = default;
-    ScopeGuard& operator=(ScopeGuard&&) = default;
+    ScopeGuard(ScopeGuard&&) noexcept = default;
+    ScopeGuard& operator=(ScopeGuard&&) noexcept = default;
 
     ScopeGuard(ScopeGuard&) = delete;
     ScopeGuard& operator=(ScopeGuard&) = delete;

src/tests/hello_xr/graphicsplugin_vulkan.cpp

@@ -610,7 +610,7 @@ struct RenderTarget {
         m_vkDevice = nullptr;
     }
 
-    RenderTarget(RenderTarget&& other) : RenderTarget() {
+    RenderTarget(RenderTarget&& other) noexcept : RenderTarget() {
         using std::swap;
         swap(colorImage, other.colorImage);
         swap(depthImage, other.depthImage);
@@ -619,7 +619,7 @@ struct RenderTarget {
         swap(fb, other.fb);
         swap(m_vkDevice, other.m_vkDevice);
     }
-    RenderTarget& operator=(RenderTarget&& other) {
+    RenderTarget& operator=(RenderTarget&& other) noexcept {
         if (&other == this) {
             return *this;
         }
@@ -884,14 +884,14 @@ struct DepthBuffer {
         m_vkDevice = nullptr;
     }
 
-    DepthBuffer(DepthBuffer&& other) : DepthBuffer() {
+    DepthBuffer(DepthBuffer&& other) noexcept : DepthBuffer() {
         using std::swap;
 
         swap(depthImage, other.depthImage);
         swap(depthMemory, other.depthMemory);
         swap(m_vkDevice, other.m_vkDevice);
     }
-    DepthBuffer& operator=(DepthBuffer&& other) {
+    DepthBuffer& operator=(DepthBuffer&& other) noexcept {
         if (&other == this) {
             return *this;
         }