Commit bb54223b by Jamie Madill Committed by Commit Bot

Vulkan: Remove RendererVk::getNextSubmitFence.

This function is no longer used. Bug: b/172704839 Change-Id: I649b205aa5603a25ed28a5fae12ad455d02d0145 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2537236 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCourtney Goeltzenleuchter <courtneygo@google.com> Reviewed-by: 's avatarTim Van Patten <timvp@google.com>
parent e5a5567d
...@@ -538,10 +538,6 @@ void RendererVk::onDestroy(vk::Context *context) ...@@ -538,10 +538,6 @@ void RendererVk::onDestroy(vk::Context *context)
std::lock_guard<std::mutex> lock(mFenceRecyclerMutex); std::lock_guard<std::mutex> lock(mFenceRecyclerMutex);
mFenceRecycler.destroy(mDevice); mFenceRecycler.destroy(mDevice);
} }
{
std::lock_guard<decltype(mNextSubmitFenceMutex)> lock(mNextSubmitFenceMutex);
mNextSubmitFence.reset(mDevice);
}
mPipelineCache.destroy(mDevice); mPipelineCache.destroy(mDevice);
mSamplerCache.destroy(this); mSamplerCache.destroy(this);
...@@ -2291,30 +2287,6 @@ angle::Result RendererVk::newSharedFence(vk::Context *context, ...@@ -2291,30 +2287,6 @@ angle::Result RendererVk::newSharedFence(vk::Context *context,
return angle::Result::Continue; return angle::Result::Continue;
} }
// Return a shared fence to be used for the next submit
// Fence may be shared with a Sync object.
// reset indicates that nextSubmitFence should be reset before returning. This ensures that the next
// request for a submit fence gets a fresh fence.
// TODO: https://issuetracker.google.com/issues/170312581 - move to CommandProcessor as part of
// fence ownership follow-up task.
angle::Result RendererVk::getNextSubmitFence(vk::Shared<vk::Fence> *sharedFenceOut, bool reset)
{
std::lock_guard<decltype(mNextSubmitFenceMutex)> lock(mNextSubmitFenceMutex);
if (!mNextSubmitFence.isReferenced())
{
ANGLE_TRY(newSharedFence(&mCommandProcessor, &mNextSubmitFence));
}
ASSERT(!sharedFenceOut->isReferenced());
sharedFenceOut->copy(getDevice(), mNextSubmitFence);
if (reset)
{
resetSharedFence(&mNextSubmitFence);
}
return angle::Result::Continue;
}
template <VkFormatFeatureFlags VkFormatProperties::*features> template <VkFormatFeatureFlags VkFormatProperties::*features>
VkFormatFeatureFlags RendererVk::getFormatFeatureBits(VkFormat format, VkFormatFeatureFlags RendererVk::getFormatFeatureBits(VkFormat format,
const VkFormatFeatureFlags featureBits) const const VkFormatFeatureFlags featureBits) const
......
...@@ -190,8 +190,6 @@ class RendererVk : angle::NonCopyable ...@@ -190,8 +190,6 @@ class RendererVk : angle::NonCopyable
sharedFenceIn->resetAndRecycle(&mFenceRecycler); sharedFenceIn->resetAndRecycle(&mFenceRecycler);
} }
angle::Result getNextSubmitFence(vk::Shared<vk::Fence> *sharedFenceOut, bool reset);
template <typename... ArgsT> template <typename... ArgsT>
void collectGarbageAndReinit(vk::SharedResourceUse *use, ArgsT... garbageIn) void collectGarbageAndReinit(vk::SharedResourceUse *use, ArgsT... garbageIn)
{ {
...@@ -450,10 +448,6 @@ class RendererVk : angle::NonCopyable ...@@ -450,10 +448,6 @@ class RendererVk : angle::NonCopyable
// Async Command Queue // Async Command Queue
vk::CommandProcessor mCommandProcessor; vk::CommandProcessor mCommandProcessor;
// mNextSubmitFence is the fence that's going to be signaled at the next submission. This is
// used to support SyncVk objects, which may outlive the context (as EGLSync objects).
vk::Shared<vk::Fence> mNextSubmitFence;
std::mutex mNextSubmitFenceMutex;
// track whether we initialized (or released) glslang // track whether we initialized (or released) glslang
bool mGlslangInitialized; bool mGlslangInitialized;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment