shaderObject: Fix object name crash

ziga-lunarg · Sep 5, 2024 · b9ee8f5 · b9ee8f5
1 parent 6d60024
commit b9ee8f5
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 13 deletions.
diff --git a/layers/shader_object/generated/shader_object_constants.h b/layers/shader_object/generated/shader_object_constants.h
@@ -2,7 +2,7 @@
 // See shader_object_generator.py for modifications
 
 /*
- * Copyright 2023 Nintendo
+ * Copyright 2023-2024 Nintendo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/layers/shader_object/generated/shader_object_create_device_feature_structs.inl b/layers/shader_object/generated/shader_object_create_device_feature_structs.inl
@@ -2,7 +2,7 @@
 // See shader_object_generator.py for modifications
 
 /*
- * Copyright 2023 Nintendo
+ * Copyright 2023-2024 Nintendo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/layers/shader_object/generated/shader_object_device_data_declare_extension_variables.inl b/layers/shader_object/generated/shader_object_device_data_declare_extension_variables.inl
@@ -2,7 +2,7 @@
 // See shader_object_generator.py for modifications
 
 /*
- * Copyright 2023 Nintendo
+ * Copyright 2023-2024 Nintendo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/layers/shader_object/generated/shader_object_device_data_dynamic_state_adding.inl b/layers/shader_object/generated/shader_object_device_data_dynamic_state_adding.inl
@@ -2,7 +2,7 @@
 // See shader_object_generator.py for modifications
 
 /*
- * Copyright 2023 Nintendo
+ * Copyright 2023-2024 Nintendo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/layers/shader_object/generated/shader_object_device_data_set_extension_variables.inl b/layers/shader_object/generated/shader_object_device_data_set_extension_variables.inl
@@ -2,7 +2,7 @@
 // See shader_object_generator.py for modifications
 
 /*
- * Copyright 2023 Nintendo
+ * Copyright 2023-2024 Nintendo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/layers/shader_object/generated/shader_object_entry_points_x_macros.inl b/layers/shader_object/generated/shader_object_entry_points_x_macros.inl
@@ -2,7 +2,7 @@
 // See shader_object_generator.py for modifications
 
 /*
- * Copyright 2023 Nintendo
+ * Copyright 2023-2024 Nintendo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -130,7 +130,9 @@
     ENTRY_POINT(CreateDescriptorUpdateTemplate)\
     ENTRY_POINT_ALIAS(CreateDescriptorUpdateTemplateKHR, CreateDescriptorUpdateTemplate)\
     ENTRY_POINT(DestroyDescriptorUpdateTemplate)\
-    ENTRY_POINT_ALIAS(DestroyDescriptorUpdateTemplateKHR, DestroyDescriptorUpdateTemplate)
+    ENTRY_POINT_ALIAS(DestroyDescriptorUpdateTemplateKHR, DestroyDescriptorUpdateTemplate)\
+    ENTRY_POINT(SetDebugUtilsObjectNameEXT)\
+    ENTRY_POINT(SetDebugUtilsObjectTagEXT)
 
 #define ADDITIONAL_INSTANCE_FUNCTIONS\
     ENTRY_POINT(GetPhysicalDeviceProperties)\

diff --git a/...shader_object/generated/shader_object_find_intercepted_dynamic_state_function_by_name.inl b/...shader_object/generated/shader_object_find_intercepted_dynamic_state_function_by_name.inl
@@ -2,7 +2,7 @@
 // See shader_object_generator.py for modifications
 
 /*
- * Copyright 2023 Nintendo
+ * Copyright 2023-2024 Nintendo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/layers/shader_object/generated/shader_object_full_draw_state_struct_members.cpp b/layers/shader_object/generated/shader_object_full_draw_state_struct_members.cpp
@@ -2,7 +2,7 @@
 // See shader_object_generator.py for modifications
 
 /*
- * Copyright 2023 Nintendo
+ * Copyright 2023-2024 Nintendo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/layers/shader_object/generated/shader_object_full_draw_state_struct_members.inl b/layers/shader_object/generated/shader_object_full_draw_state_struct_members.inl
@@ -2,7 +2,7 @@
 // See shader_object_generator.py for modifications
 
 /*
- * Copyright 2023 Nintendo
+ * Copyright 2023-2024 Nintendo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/layers/shader_object/generated/shader_object_full_draw_state_utility_functions.inl b/layers/shader_object/generated/shader_object_full_draw_state_utility_functions.inl
@@ -2,7 +2,7 @@
 // See shader_object_generator.py for modifications
 
 /*
- * Copyright 2023 Nintendo
+ * Copyright 2023-2024 Nintendo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/layers/shader_object/shader_object.cpp b/layers/shader_object/shader_object.cpp
@@ -3165,6 +3165,24 @@ static VKAPI_ATTR void DestroyDescriptorUpdateTemplate(VkDevice device, VkDescri
     RemoveDescriptorUpdateTemplateBindPoint(device_data, descriptorUpdateTemplate);
 }
 
+static VKAPI_ATTR VkResult VKAPI_CALL SetDebugUtilsObjectNameEXT(VkDevice device, const VkDebugUtilsObjectNameInfoEXT *pNameInfo) {
+    DeviceData& data = *device_data_map.Get(device);
+    VkResult result = VK_SUCCESS;
+    if (pNameInfo && pNameInfo->objectType != VK_OBJECT_TYPE_SHADER_EXT) {
+        result = data.vtable.SetDebugUtilsObjectNameEXT(device, pNameInfo);
+    }
+    return result;
+}
+
+static VKAPI_ATTR VkResult VKAPI_CALL SetDebugUtilsObjectTagEXT(VkDevice device, const VkDebugUtilsObjectTagInfoEXT* pTagInfo) {
+    DeviceData& data = *device_data_map.Get(device);
+    VkResult result = VK_SUCCESS;
+    if (pTagInfo && pTagInfo->objectType != VK_OBJECT_TYPE_SHADER_EXT) {
+        result = data.vtable.SetDebugUtilsObjectTagEXT(device, pTagInfo);
+    }
+    return result;
+}
+
 static VKAPI_ATTR void VKAPI_CALL FakeCmdSetColorBlendAdvancedEXT(VkCommandBuffer, uint32_t, uint32_t, const VkColorBlendAdvancedEXT*) {}
 
 // Get Proc Addr

diff --git a/scripts/shader_object_data.json b/scripts/shader_object_data.json
@@ -1224,6 +1224,12 @@
                 [
                     "DestroyDescriptorUpdateTemplate",
                     "DestroyDescriptorUpdateTemplateKHR"
+                ],
+                [
+                    "SetDebugUtilsObjectNameEXT"
+                ],
+                [
+                    "SetDebugUtilsObjectTagEXT"
                 ]
             ]
         },

diff --git a/scripts/shader_object_generator.py b/scripts/shader_object_generator.py
@@ -1,4 +1,4 @@
-# Copyright 2023 Nintendo
+# Copyright 2023-2024 Nintendo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ def create_generated_file(filename):
 // See shader_object_generator.py for modifications
 
 /*
- * Copyright 2023 Nintendo
+ * Copyright 2023-2024 Nintendo
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.