Ryujinx/moltenvk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove secondary MVKSwapchainImage constructor.

Browse Source
This commit is contained in:
Bill Hollings 2020-04-02 11:35:26 -04:00
parent 6229582887
commit fde9d515ca
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
View File

@ -2131,7 +2131,7 @@ MVKImage* MVKDevice::createImage(const VkImageCreateInfo* pCreateInfo,
}
}
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));
}

5
MoltenVK/MoltenVK/GPUObjects/MVKImage.h
View File

@ -320,11 +320,6 @@ public:
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:

5
MoltenVK/MoltenVK/GPUObjects/MVKImage.mm
View File

@ -991,11 +991,6 @@ MVKSwapchainImage::MVKSwapchainImage(MVKDevice* device,
_preSignaler = make_pair(nullptr, nullptr);
}
MVKSwapchainImage::MVKSwapchainImage(MVKDevice* device,
const VkImageCreateInfo* pCreateInfo,
MVKSwapchain* swapchain) :
MVKSwapchainImage(device, pCreateInfo, swapchain, uint32_t(-1)) {}
MVKSwapchainImage::~MVKSwapchainImage() {
resetMetalDrawable();
}