summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/angle/src/common/MemoryBuffer.h
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2020-05-18 15:16:30 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2020-05-26 15:11:40 +0200
commit752497910b67b2a1a80560840ca44548d8893434 (patch)
tree541501c9abfd97c3d2fa450d2e6abb60582c4420 /src/3rdparty/angle/src/common/MemoryBuffer.h
parent7db527dbdd911c79f31425d099d1fc9c63e42453 (diff)
Remove ANGLE
This marks the end of EGL and OpenGL ES support on Windows. The concepts of -opengl dynamic, -opengl desktop, QT_OPENGL=software, etc. remain unchanged, with the exception of the disapperance of everything ANGLE related. CMake builds now work identically to qmake on Windows: they default to 'dynamic' OpenGL on Windows, unless -DINPUT_opengl=desktop is specified. On Windows, Qt 6 is expected to default to the "dynamic" OpenGL model by default, just like Qt 5.15. This can be changed by switching to "desktop" OpenGL, which will link to opengl32 (publicly, so other libs and applications will do so as well) and disallows using another OpenGL DLL. The "dynamic" mode is essential still because the fallback to a software rasterizer, such as the opengl32sw.dll we ship with the Qt packages, has to to work exactly like in Qt 5, the removal of ANGLE does not change this concept in any way (except of course that the middle option of using ANGLE is now gone) When it comes to the windows plugin's OpenGL blacklist feature, it works like before and accepts the ANGLE/D3D related keywords. They will then be ignored. Similarly, requesting QT_OPENGL=angle is ignored (but will show a warning). The D3D11 and DXGI configure time tests are removed: Qt 5.14 already depends on D3D 11.1 and DXGI 1.3 headers being available unconditionally on Win32 (in QRhi's D3D11 backend). No need to test for these. [ChangeLog][Windows] ANGLE is no longer included with Qt. Dynamic OpenGL builds work like before but ANGLE is no longer an option. OpenGL proper or an alternative opengl32 implementation are the two remaining options now. Attempting to set QT_OPENGL=angle or Qt::AA_UseOpenGLES will have no effect on Windows. Fixes: QTBUG-79103 Change-Id: Ia404e0d07f3fe191b27434d863c81180112ecb3b Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/3rdparty/angle/src/common/MemoryBuffer.h')
-rw-r--r--src/3rdparty/angle/src/common/MemoryBuffer.h77
1 files changed, 0 insertions, 77 deletions
diff --git a/src/3rdparty/angle/src/common/MemoryBuffer.h b/src/3rdparty/angle/src/common/MemoryBuffer.h
deleted file mode 100644
index f76b9ee62e..0000000000
--- a/src/3rdparty/angle/src/common/MemoryBuffer.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2014 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.
-//
-
-#ifndef COMMON_MEMORYBUFFER_H_
-#define COMMON_MEMORYBUFFER_H_
-
-#include "common/Optional.h"
-#include "common/angleutils.h"
-#include "common/debug.h"
-
-#include <stdint.h>
-#include <cstddef>
-
-namespace angle
-{
-
-class MemoryBuffer final : NonCopyable
-{
- public:
- MemoryBuffer();
- ~MemoryBuffer();
-
- MemoryBuffer(MemoryBuffer &&other);
- MemoryBuffer &operator=(MemoryBuffer &&other);
-
- bool resize(size_t size);
- size_t size() const { return mSize; }
- bool empty() const { return mSize == 0; }
-
- const uint8_t *data() const { return mData; }
- uint8_t *data()
- {
- ASSERT(mData);
- return mData;
- }
-
- void fill(uint8_t datum);
-
- private:
- size_t mSize;
- uint8_t *mData;
-};
-
-class ScratchBuffer final : NonCopyable
-{
- public:
- // If we request a scratch buffer requesting a smaller size this many times, release and
- // recreate the scratch buffer. This ensures we don't have a degenerate case where we are stuck
- // hogging memory.
- ScratchBuffer(uint32_t lifetime);
- ~ScratchBuffer();
-
- // Returns true with a memory buffer of the requested size, or false on failure.
- bool get(size_t requestedSize, MemoryBuffer **memoryBufferOut);
-
- // Same as get, but ensures new values are initialized to a fixed constant.
- bool getInitialized(size_t requestedSize, MemoryBuffer **memoryBufferOut, uint8_t initValue);
-
- // Ticks the release counter for the scratch buffer. Also done implicitly in get().
- void tick();
-
- void clear();
-
- private:
- bool getImpl(size_t requestedSize, MemoryBuffer **memoryBufferOut, Optional<uint8_t> initValue);
-
- const uint32_t mLifetime;
- uint32_t mResetCounter;
- MemoryBuffer mScratchMemory;
-};
-
-} // namespace angle
-
-#endif // COMMON_MEMORYBUFFER_H_