From a218a252c4200cfe7048de81a46f7e48349084d5 Mon Sep 17 00:00:00 2001 From: Andrew Knight Date: Wed, 8 Apr 2015 17:04:36 +0300 Subject: Upgrade ANGLE to 2.1~99f075dade7c This aligns with Chromium branch 2356. This version brings more complete OpenGL ES 3 support as well as various bug fixes and performance improvements. The following changes were made to earlier patches: -0000-General-fixes-for-ANGLE-2.1 Removed. All changes are now handled elsewhere. +0001-ANGLE-Improve-Windows-Phone-support Consolidated remaining parts from 0009/0010. +0002-ANGLE-Fix-compilation-with-MinGW Remaining issues from patch 0016. +0003-ANGLE-Fix-compilation-with-MSVC2010 Remaining issues from patch 0015. +0004-ANGLE-Dynamically-load-D3D-compiler-from-list Renamed from patch 0008. +0005-ANGLE-Add-support-for-querying-platform-device Renamed from patch 0013. -0004-Make-it-possible-to-link-ANGLE-statically-for-single Removed. Fixed by adding defines to project files. -0008-ANGLE-Dynamically-load-D3D-compiler-from-a-list-or-t Renamed to patch 0005. -0009-ANGLE-Support-WinRT Removed. Mostly fixed upstream; remaining parts in patch 0001. -0010-ANGLE-Enable-D3D11-for-feature-level-9-cards Removed. Mostly fixed upstream; remaining parts in patch 0001. -0012-ANGLE-fix-semantic-index-lookup Removed. Fixed upstream. -0013-ANGLE-Add-support-for-querying-platform-device Renamed to patch 0005. -0014-Let-ANGLE-use-multithreaded-devices-if-necessary Removed. No longer needed. -0015-ANGLE-Fix-angle-d3d11-on-MSVC2010 Moved remaining parts to patch 0003. -0016-ANGLE-Fix-compilation-with-MinGW-D3D11 Moved remaining parts to patch 0002. -0017-ANGLE-Fix-compilation-with-D3D9 Removed. Fixed upstream. -0018-ANGLE-Fix-releasing-textures-after-we-kill-D3D11 Removed. Fixed upstream. -0019-ANGLE-Fix-handling-of-shader-source-with-fixed-lengt Removed. Fixed upstream. -0020-ANGLE-Do-not-use-std-strlen Removed. Fixed upstream. -0020-ANGLE-Fix-compilation-with-MSVC2013-Update4 Removed. Fixed upstream. [ChangeLog][Third-party libraries] ANGLE was updated to Chromium branch 2356 (2.1~99f075dade7c). Change-Id: I32ccbfe95e10986bd94be7191dfd53445ea09158 Task-number: QTBUG-44815 Task-number: QTBUG-37660 Task-number: QTBUG-44694 Task-number: QTBUG-42443 Reviewed-by: Andrew Knight Reviewed-by: Friedemann Kleint --- src/3rdparty/angle/src/libGLESv2/Fence.cpp | 116 ----------------------------- 1 file changed, 116 deletions(-) delete mode 100644 src/3rdparty/angle/src/libGLESv2/Fence.cpp (limited to 'src/3rdparty/angle/src/libGLESv2/Fence.cpp') diff --git a/src/3rdparty/angle/src/libGLESv2/Fence.cpp b/src/3rdparty/angle/src/libGLESv2/Fence.cpp deleted file mode 100644 index 966a327de5..0000000000 --- a/src/3rdparty/angle/src/libGLESv2/Fence.cpp +++ /dev/null @@ -1,116 +0,0 @@ -// -// Copyright (c) 2002-2013 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. -// - -// Fence.cpp: Implements the gl::FenceNV and gl::FenceSync classes, which support the GL_NV_fence -// extension and GLES3 sync objects. - -#include "libGLESv2/Fence.h" -#include "libGLESv2/renderer/FenceImpl.h" -#include "libGLESv2/renderer/Renderer.h" -#include "libGLESv2/main.h" -#include "common/utilities.h" - -#include "angle_gl.h" - -namespace gl -{ - -FenceNV::FenceNV(rx::FenceNVImpl *impl) - : mFence(impl), - mIsSet(false), - mStatus(GL_FALSE), - mCondition(GL_NONE) -{ -} - -FenceNV::~FenceNV() -{ - SafeDelete(mFence); -} - -GLboolean FenceNV::isFence() const -{ - // GL_NV_fence spec: - // A name returned by GenFencesNV, but not yet set via SetFenceNV, is not the name of an existing fence. - return (mIsSet ? GL_TRUE : GL_FALSE); -} - -Error FenceNV::setFence(GLenum condition) -{ - Error error = mFence->set(); - if (error.isError()) - { - return error; - } - - mCondition = condition; - mStatus = GL_FALSE; - mIsSet = true; - - return Error(GL_NO_ERROR); -} - -Error FenceNV::testFence(GLboolean *outResult) -{ - // Flush the command buffer by default - Error error = mFence->test(true, &mStatus); - if (error.isError()) - { - return error; - } - - *outResult = mStatus; - return Error(GL_NO_ERROR); -} - -Error FenceNV::finishFence() -{ - ASSERT(mIsSet); - - return mFence->finishFence(&mStatus); -} - -FenceSync::FenceSync(rx::FenceSyncImpl *impl, GLuint id) - : RefCountObject(id), - mFence(impl), - mCondition(GL_NONE) -{ -} - -FenceSync::~FenceSync() -{ - SafeDelete(mFence); -} - -Error FenceSync::set(GLenum condition) -{ - Error error = mFence->set(); - if (error.isError()) - { - return error; - } - - mCondition = condition; - return Error(GL_NO_ERROR); -} - -Error FenceSync::clientWait(GLbitfield flags, GLuint64 timeout, GLenum *outResult) -{ - ASSERT(mCondition != GL_NONE); - return mFence->clientWait(flags, timeout, outResult); -} - -Error FenceSync::serverWait(GLbitfield flags, GLuint64 timeout) -{ - return mFence->serverWait(flags, timeout); -} - -Error FenceSync::getStatus(GLint *outResult) const -{ - return mFence->getStatus(outResult); -} - -} -- cgit v1.2.3