From 0a7aebadfbb3534284546aa3ca8612314c08f136 Mon Sep 17 00:00:00 2001 From: Miguel Costa Date: Tue, 26 Jun 2018 16:56:45 +0200 Subject: Update ANGLE to chromium/3280 Change-Id: I0802c0d7486f772d361f87a544d6c5af937f4ca1 Reviewed-by: Friedemann Kleint --- src/3rdparty/angle/src/libANGLE/Fence.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/3rdparty/angle/src/libANGLE/Fence.h') diff --git a/src/3rdparty/angle/src/libANGLE/Fence.h b/src/3rdparty/angle/src/libANGLE/Fence.h index b2daed6f0e..24bc689ca3 100644 --- a/src/3rdparty/angle/src/libANGLE/Fence.h +++ b/src/3rdparty/angle/src/libANGLE/Fence.h @@ -4,7 +4,7 @@ // found in the LICENSE file. // -// Fence.h: Defines the gl::FenceNV and gl::FenceSync classes, which support the GL_NV_fence +// Fence.h: Defines the gl::FenceNV and gl::Sync classes, which support the GL_NV_fence // extension and GLES3 sync objects. #ifndef LIBANGLE_FENCE_H_ @@ -19,7 +19,7 @@ namespace rx { class FenceNVImpl; -class FenceSyncImpl; +class SyncImpl; } namespace gl @@ -48,11 +48,13 @@ class FenceNV final : angle::NonCopyable GLenum mCondition; }; -class FenceSync final : public RefCountObject, public LabeledObject +class Sync final : public RefCountObject, public LabeledObject { public: - FenceSync(rx::FenceSyncImpl *impl, GLuint id); - virtual ~FenceSync(); + Sync(rx::SyncImpl *impl, GLuint id); + ~Sync() override; + + Error onDestroy(const Context *context) override; void setLabel(const std::string &label) override; const std::string &getLabel() const override; @@ -66,7 +68,7 @@ class FenceSync final : public RefCountObject, public LabeledObject GLbitfield getFlags() const { return mFlags; } private: - rx::FenceSyncImpl *mFence; + rx::SyncImpl *mFence; std::string mLabel; @@ -74,6 +76,6 @@ class FenceSync final : public RefCountObject, public LabeledObject GLbitfield mFlags; }; -} +} // namespace gl #endif // LIBANGLE_FENCE_H_ -- cgit v1.2.3