Hash :
54532241
Author :
Date :
2023-01-19T15:45:29
Vulkan: Remove mUse related code from SyncHelperNativeFence Since adding `rx::vk::ExternalFence` class, waiting on `mUse` is almost the same as waiting directly on `mExternalFence`. Because `mUse` is no longer required to release the fence and to reduce code complexity, `mUse` related code paths were removed. Since `SyncHelperNativeFence` no longer using `mUse` no need to inherit from `SyncHelper`. Added `SyncHelperInterface` abstract base instead. Bug: angleproject:8115 Change-Id: I2aabbc905d833f8bf6db36b3be356d6db40349d0 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4392880 Reviewed-by: Charlie Lao <cclao@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Igor Nazarov <i.nazarov@samsung.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187
//
// Copyright 2016 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// SyncVk:
// Defines the class interface for SyncVk, implementing SyncImpl.
//
#ifndef LIBANGLE_RENDERER_VULKAN_FENCESYNCVK_H_
#define LIBANGLE_RENDERER_VULKAN_FENCESYNCVK_H_
#include "libANGLE/renderer/EGLSyncImpl.h"
#include "libANGLE/renderer/SyncImpl.h"
#include "libANGLE/renderer/vulkan/ResourceVk.h"
namespace egl
{
class AttributeMap;
}
namespace rx
{
namespace vk
{
// Represents an invalid native fence FD.
constexpr int kInvalidFenceFd = EGL_NO_NATIVE_FENCE_FD_ANDROID;
class ExternalFence final : angle::NonCopyable
{
public:
ExternalFence();
~ExternalFence();
VkResult init(VkDevice device, const VkFenceCreateInfo &createInfo);
void init(int fenceFd);
VkFence getHandle() const { return mFence.getHandle(); }
VkResult getStatus(VkDevice device) const;
VkResult wait(VkDevice device, uint64_t timeout) const;
void exportFd(VkDevice device, const VkFenceGetFdInfoKHR &fenceGetFdInfo);
VkResult getFenceFdStatus() const { return mFenceFdStatus; }
int getFenceFd() const { return mFenceFd; }
private:
VkDevice mDevice;
Fence mFence;
VkResult mFenceFdStatus;
int mFenceFd;
};
using SharedExternalFence = std::shared_ptr<ExternalFence>;
class SyncHelperInterface : angle::NonCopyable
{
public:
virtual ~SyncHelperInterface() = default;
virtual void releaseToRenderer(RendererVk *renderer) = 0;
virtual angle::Result clientWait(Context *context,
ContextVk *contextVk,
bool flushCommands,
uint64_t timeout,
VkResult *outResult) = 0;
virtual angle::Result serverWait(ContextVk *contextVk) = 0;
virtual angle::Result getStatus(Context *context, ContextVk *contextVk, bool *signaledOut) = 0;
virtual angle::Result dupNativeFenceFD(Context *context, int *fdOut) const = 0;
};
// Implementation of fence types - glFenceSync, and EGLSync(EGL_SYNC_FENCE_KHR).
// The behaviors of SyncVk and EGLFenceSyncVk as fence syncs are currently
// identical for the Vulkan backend, and this class implements both interfaces.
class SyncHelper final : public vk::Resource, public SyncHelperInterface
{
public:
SyncHelper();
~SyncHelper() override;
angle::Result initialize(ContextVk *contextVk, bool isEGLSyncObject);
// SyncHelperInterface
void releaseToRenderer(RendererVk *renderer) override;
angle::Result clientWait(Context *context,
ContextVk *contextVk,
bool flushCommands,
uint64_t timeout,
VkResult *outResult) override;
angle::Result serverWait(ContextVk *contextVk) override;
angle::Result getStatus(Context *context, ContextVk *contextVk, bool *signaledOut) override;
angle::Result dupNativeFenceFD(Context *context, int *fdOut) const override
{
return angle::Result::Stop;
}
private:
angle::Result submitSyncIfDeferred(ContextVk *contextVk, RenderPassClosureReason reason);
};
// Implementation of sync types: EGLSync(EGL_SYNC_ANDROID_NATIVE_FENCE_ANDROID).
class SyncHelperNativeFence final : public SyncHelperInterface
{
public:
SyncHelperNativeFence();
~SyncHelperNativeFence() override;
angle::Result initializeWithFd(ContextVk *contextVk, int inFd);
// SyncHelperInterface
void releaseToRenderer(RendererVk *renderer) override;
angle::Result clientWait(Context *context,
ContextVk *contextVk,
bool flushCommands,
uint64_t timeout,
VkResult *outResult) override;
angle::Result serverWait(ContextVk *contextVk) override;
angle::Result getStatus(Context *context, ContextVk *contextVk, bool *signaledOut) override;
angle::Result dupNativeFenceFD(Context *context, int *fdOut) const override;
private:
SharedExternalFence mExternalFence;
};
} // namespace vk
// Implementor for glFenceSync.
class SyncVk final : public SyncImpl
{
public:
SyncVk();
~SyncVk() override;
void onDestroy(const gl::Context *context) override;
angle::Result set(const gl::Context *context, GLenum condition, GLbitfield flags) override;
angle::Result clientWait(const gl::Context *context,
GLbitfield flags,
GLuint64 timeout,
GLenum *outResult) override;
angle::Result serverWait(const gl::Context *context,
GLbitfield flags,
GLuint64 timeout) override;
angle::Result getStatus(const gl::Context *context, GLint *outResult) override;
private:
vk::SyncHelper mSyncHelper;
};
// Implementor for EGLSync.
class EGLSyncVk final : public EGLSyncImpl
{
public:
EGLSyncVk(const egl::AttributeMap &attribs);
~EGLSyncVk() override;
void onDestroy(const egl::Display *display) override;
egl::Error initialize(const egl::Display *display,
const gl::Context *context,
EGLenum type) override;
egl::Error clientWait(const egl::Display *display,
const gl::Context *context,
EGLint flags,
EGLTime timeout,
EGLint *outResult) override;
egl::Error serverWait(const egl::Display *display,
const gl::Context *context,
EGLint flags) override;
egl::Error getStatus(const egl::Display *display, EGLint *outStatus) override;
egl::Error dupNativeFenceFD(const egl::Display *display, EGLint *fdOut) const override;
private:
EGLenum mType;
// SyncHelper or SyncHelperNativeFence decided at run-time.
vk::SyncHelperInterface *mSyncHelper;
EGLint mNativeFenceFD;
};
} // namespace rx
#endif // LIBANGLE_RENDERER_VULKAN_FENCESYNCVK_H_