summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/angle/src/libGLESv2/main.cpp
diff options
context:
space:
mode:
authorAndrew Knight <andrew.knight@intopalo.com>2015-04-08 17:04:36 +0300
committerAndrew Knight <qt@panimo.net>2015-04-09 10:31:12 +0000
commita218a252c4200cfe7048de81a46f7e48349084d5 (patch)
treec1a82865d97e610cd0abb3a1360408363b38205b /src/3rdparty/angle/src/libGLESv2/main.cpp
parent331ddacfca90c91c5b44484bf3c78e2aa5b85947 (diff)
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 <qt@panimo.net> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Diffstat (limited to 'src/3rdparty/angle/src/libGLESv2/main.cpp')
-rw-r--r--src/3rdparty/angle/src/libGLESv2/main.cpp186
1 files changed, 0 insertions, 186 deletions
diff --git a/src/3rdparty/angle/src/libGLESv2/main.cpp b/src/3rdparty/angle/src/libGLESv2/main.cpp
deleted file mode 100644
index 00f63ae079..0000000000
--- a/src/3rdparty/angle/src/libGLESv2/main.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-//
-// Copyright (c) 2002-2012 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.
-//
-
-// main.cpp: DLL entry point and management of thread-local data.
-
-#include "libGLESv2/main.h"
-#include "libGLESv2/Context.h"
-
-#include "common/tls.h"
-
-static TLSIndex currentTLS = TLS_INVALID_INDEX;
-
-namespace gl
-{
-
-// TODO(kbr): figure out how these are going to be managed on
-// non-Windows platforms. These routines would need to be exported
-// from ANGLE and called cooperatively when users create and destroy
-// threads -- or the initialization of the TLS index, and allocation
-// of thread-local data, will have to be done lazily. Will have to use
-// destructor function with pthread_create_key on POSIX platforms to
-// clean up thread-local data.
-
-// Call this exactly once at process startup.
-bool CreateThreadLocalIndex()
-{
- currentTLS = CreateTLSIndex();
- if (currentTLS == TLS_INVALID_INDEX)
- {
- return false;
- }
- return true;
-}
-
-// Call this exactly once at process shutdown.
-void DestroyThreadLocalIndex()
-{
- DestroyTLSIndex(currentTLS);
- currentTLS = TLS_INVALID_INDEX;
-}
-
-// Call this upon thread startup.
-Current *AllocateCurrent()
-{
- ASSERT(currentTLS != TLS_INVALID_INDEX);
- if (currentTLS == TLS_INVALID_INDEX)
- {
- return NULL;
- }
-
- Current *current = new Current();
- current->context = NULL;
- current->display = NULL;
-
- if (!SetTLSValue(currentTLS, current))
- {
- ERR("Could not set thread local storage.");
- return NULL;
- }
-
- return current;
-}
-
-// Call this upon thread shutdown.
-void DeallocateCurrent()
-{
- Current *current = reinterpret_cast<Current*>(GetTLSValue(currentTLS));
- SafeDelete(current);
- SetTLSValue(currentTLS, NULL);
-}
-
-}
-
-#if defined(ANGLE_PLATFORM_WINDOWS) && !defined(QT_OPENGL_ES_2_ANGLE_STATIC)
-extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
-{
- switch (reason)
- {
- case DLL_PROCESS_ATTACH:
- {
- if (!gl::CreateThreadLocalIndex())
- {
- return FALSE;
- }
-
-#ifdef ANGLE_ENABLE_DEBUG_ANNOTATIONS
- gl::InitializeDebugAnnotations();
-#endif
- }
- // Fall through to initialize index
- case DLL_THREAD_ATTACH:
- {
- gl::AllocateCurrent();
- }
- break;
- case DLL_THREAD_DETACH:
- {
- gl::DeallocateCurrent();
- }
- break;
- case DLL_PROCESS_DETACH:
- {
- gl::DeallocateCurrent();
- gl::DestroyThreadLocalIndex();
-
-#ifdef ANGLE_ENABLE_DEBUG_ANNOTATIONS
- gl::UninitializeDebugAnnotations();
-#endif
- }
- break;
- default:
- break;
- }
-
- return TRUE;
-}
-#endif // ANGLE_PLATFORM_WINDOWS && !QT_OPENGL_ES_2_ANGLE_STATIC
-
-namespace gl
-{
-
-Current *GetCurrentData()
-{
-#ifndef QT_OPENGL_ES_2_ANGLE_STATIC
- Current *current = reinterpret_cast<Current*>(GetTLSValue(currentTLS));
-
- // ANGLE issue 488: when the dll is loaded after thread initialization,
- // thread local storage (current) might not exist yet.
- return (current ? current : AllocateCurrent());
-#else
- // No precautions for thread safety taken as ANGLE is used single-threaded in Qt.
- static Current current = { 0, 0 };
- return &current;
-#endif
-}
-
-void makeCurrent(Context *context, egl::Display *display, egl::Surface *surface)
-{
- Current *current = GetCurrentData();
-
- current->context = context;
- current->display = display;
-
- if (context && display && surface)
- {
- context->makeCurrent(surface);
- }
-}
-
-Context *getContext()
-{
- Current *current = GetCurrentData();
-
- return current->context;
-}
-
-Context *getNonLostContext()
-{
- Context *context = getContext();
-
- if (context)
- {
- if (context->isContextLost())
- {
- context->recordError(Error(GL_OUT_OF_MEMORY, "Context has been lost."));
- return NULL;
- }
- else
- {
- return context;
- }
- }
- return NULL;
-}
-
-egl::Display *getDisplay()
-{
- Current *current = GetCurrentData();
-
- return current->display;
-}
-
-}