From ffd16854c4a7ee2fead50ac2eeae2eb2cbecebcc Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijn@traverseresearch.nl>
Date: Sat, 24 Sep 2022 11:07:35 +0200
Subject: [PATCH] extensions/ext: Remove misnamed, deprecated
 `debug_utils_set_object_name()` and `debug_utils_set_object_tag()` entirely

See also #660/#661.
---
 Changelog.md                          |  3 ++-
 ash/src/extensions/ext/debug_utils.rs | 22 ----------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index ca1bda1..23e01ad 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Replaced builders with lifetimes/setters directly on Vulkan structs (#602)
 - Inlined struct setters (#602)
 - Inlined `Default` impls and trivial `Instance`/`Device`/`Entry` wrapper methods (#606, #632)
-- Renamed `debug_utils_set_object_name` to `set_debug_utils_object_name` and `debug_utils_set_object_tag` to `set_debug_utils_object_tag` for consistency and deprecated old ones (#661)
+- Renamed `debug_utils_set_object_name()` to `set_debug_utils_object_name()` and `debug_utils_set_object_tag()` to `set_debug_utils_object_tag()` for consistency and deprecated old ones (#661)
 
 ### Added
 
@@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 
 - Removed experimental AMD extensions (#607)
+- Removed misnamed, deprecated `debug_utils_set_object_name()` and `debug_utils_set_object_tag()` entirely, use `set_debug_utils_object_name()` and `set_debug_utils_object_tag()` instead
 
 ### Fixed
 
diff --git a/ash/src/extensions/ext/debug_utils.rs b/ash/src/extensions/ext/debug_utils.rs
index 46d9176..77aa190 100755
--- a/ash/src/extensions/ext/debug_utils.rs
+++ b/ash/src/extensions/ext/debug_utils.rs
@@ -19,17 +19,6 @@ impl DebugUtils {
         Self { handle, fp }
     }
 
-    /// <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/vkSetDebugUtilsObjectNameEXT.html>
-    #[deprecated = "Backwards-compatible alias containing a typo, use `set_debug_utils_object_name()` instead"]
-    #[inline]
-    pub unsafe fn debug_utils_set_object_name(
-        &self,
-        device: vk::Device,
-        name_info: &vk::DebugUtilsObjectNameInfoEXT,
-    ) -> VkResult<()> {
-        self.set_debug_utils_object_name(device, name_info)
-    }
-
     /// <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/vkSetDebugUtilsObjectNameEXT.html>
     #[inline]
     pub unsafe fn set_debug_utils_object_name(
@@ -40,17 +29,6 @@ impl DebugUtils {
         (self.fp.set_debug_utils_object_name_ext)(device, name_info).result()
     }
 
-    /// <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/vkSetDebugUtilsObjectTagEXT.html>
-    #[deprecated = "Backwards-compatible alias containing a typo, use `set_debug_utils_object_tag()` instead"]
-    #[inline]
-    pub unsafe fn debug_utils_set_object_tag(
-        &self,
-        device: vk::Device,
-        tag_info: &vk::DebugUtilsObjectTagInfoEXT,
-    ) -> VkResult<()> {
-        self.set_debug_utils_object_tag(device, tag_info)
-    }
-
     /// <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/vkSetDebugUtilsObjectTagEXT.html>
     #[inline]
     pub unsafe fn set_debug_utils_object_tag(