Remove secondary MVKSwapchainImage constructor.

KhronosGroup · Apr 2, 2020 · fde9d51 · fde9d51
1 parent 6229582
commit fde9d51
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
@@ -2131,7 +2131,7 @@ static uint32_t mvkGetEntryProperty(io_registry_entry_t entry, CFStringRef prope
 		}
 	}
 	if (swapchainInfo) {
-		return (MVKImage*)addResource(new MVKSwapchainImage(this, pCreateInfo, (MVKSwapchain*)swapchainInfo->swapchain));
+		return createSwapchainImage(pCreateInfo, (MVKSwapchain*)swapchainInfo->swapchain, uint32_t(-1), pAllocator);
 	}
 	return (MVKImage*)addResource(new MVKImage(this, pCreateInfo));
 }

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKImage.h b/MoltenVK/MoltenVK/GPUObjects/MVKImage.h
@@ -320,11 +320,6 @@ class MVKSwapchainImage : public MVKImage {
 					  MVKSwapchain* swapchain,
 					  uint32_t swapchainIndex);
 
-	/** Constructs an instance for the specified device and swapchain, without binding to a particular swapchain image index. */
-	MVKSwapchainImage(MVKDevice* device,
-					  const VkImageCreateInfo* pCreateInfo,
-					  MVKSwapchain* swapchain);
-
 	~MVKSwapchainImage() override;
 
 protected:

diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm b/MoltenVK/MoltenVK/GPUObjects/MVKImage.mm
@@ -991,11 +991,6 @@
 	_preSignaler = make_pair(nullptr, nullptr);
 }
 
-MVKSwapchainImage::MVKSwapchainImage(MVKDevice* device,
-									 const VkImageCreateInfo* pCreateInfo,
-									 MVKSwapchain* swapchain) :
-	MVKSwapchainImage(device, pCreateInfo, swapchain, uint32_t(-1)) {}
-
 MVKSwapchainImage::~MVKSwapchainImage() {
 	resetMetalDrawable();
 }