diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-05-18 15:16:30 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-05-26 15:11:40 +0200 |
commit | 752497910b67b2a1a80560840ca44548d8893434 (patch) | |
tree | 541501c9abfd97c3d2fa450d2e6abb60582c4420 /src/3rdparty/angle/src/libANGLE/renderer/d3d/BufferD3D.cpp | |
parent | 7db527dbdd911c79f31425d099d1fc9c63e42453 (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/libANGLE/renderer/d3d/BufferD3D.cpp')
-rw-r--r-- | src/3rdparty/angle/src/libANGLE/renderer/d3d/BufferD3D.cpp | 190 |
1 files changed, 0 insertions, 190 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/BufferD3D.cpp b/src/3rdparty/angle/src/libANGLE/renderer/d3d/BufferD3D.cpp deleted file mode 100644 index 7769ab2b75..0000000000 --- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/BufferD3D.cpp +++ /dev/null @@ -1,190 +0,0 @@ -// -// Copyright 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. -// - -// BufferD3D.cpp Defines common functionality between the Buffer9 and Buffer11 classes. - -#include "libANGLE/renderer/d3d/BufferD3D.h" - -#include "common/mathutil.h" -#include "common/utilities.h" -#include "libANGLE/renderer/d3d/IndexBuffer.h" -#include "libANGLE/renderer/d3d/VertexBuffer.h" -#include "libANGLE/renderer/d3d/RendererD3D.h" - -namespace rx -{ - -unsigned int BufferD3D::mNextSerial = 1; - -BufferD3D::BufferD3D(const gl::BufferState &state, BufferFactoryD3D *factory) - : BufferImpl(state), - mFactory(factory), - mStaticIndexBuffer(nullptr), - mStaticBufferCacheTotalSize(0), - mStaticVertexBufferOutOfDate(false), - mUnmodifiedDataUse(0), - mUsage(D3DBufferUsage::STATIC) -{ - updateSerial(); -} - -BufferD3D::~BufferD3D() -{ - SafeDelete(mStaticIndexBuffer); -} - -void BufferD3D::emptyStaticBufferCache() -{ - mStaticVertexBuffers.clear(); - mStaticBufferCacheTotalSize = 0; -} - -void BufferD3D::updateSerial() -{ - mSerial = mNextSerial++; -} - -void BufferD3D::updateD3DBufferUsage(const gl::Context *context, gl::BufferUsage usage) -{ - switch (usage) - { - case gl::BufferUsage::StaticCopy: - case gl::BufferUsage::StaticDraw: - case gl::BufferUsage::StaticRead: - mUsage = D3DBufferUsage::STATIC; - initializeStaticData(context); - break; - - case gl::BufferUsage::DynamicCopy: - case gl::BufferUsage::DynamicDraw: - case gl::BufferUsage::DynamicRead: - case gl::BufferUsage::StreamCopy: - case gl::BufferUsage::StreamDraw: - case gl::BufferUsage::StreamRead: - mUsage = D3DBufferUsage::DYNAMIC; - break; - default: - UNREACHABLE(); - } -} - -void BufferD3D::initializeStaticData(const gl::Context *context) -{ - if (mStaticVertexBuffers.empty()) - { - StaticVertexBufferInterface *newStaticBuffer = new StaticVertexBufferInterface(mFactory); - mStaticVertexBuffers.push_back( - std::unique_ptr<StaticVertexBufferInterface>(newStaticBuffer)); - } - if (!mStaticIndexBuffer) - { - mStaticIndexBuffer = new StaticIndexBufferInterface(mFactory); - } -} - -StaticIndexBufferInterface *BufferD3D::getStaticIndexBuffer() -{ - return mStaticIndexBuffer; -} - -StaticVertexBufferInterface *BufferD3D::getStaticVertexBuffer(const gl::VertexAttribute &attribute, - const gl::VertexBinding &binding) -{ - if (mStaticVertexBuffers.empty()) - { - // Early out if there aren't any static buffers at all - return nullptr; - } - - // Early out, the attribute can be added to mStaticVertexBuffer. - if (mStaticVertexBuffers.size() == 1 && mStaticVertexBuffers[0]->empty()) - { - return mStaticVertexBuffers[0].get(); - } - - // Cache size limiting: track the total allocated buffer sizes. - size_t currentTotalSize = 0; - - // At this point, see if any of the existing static buffers contains the attribute data - // If there is a cached static buffer that already contains the attribute, then return it - for (const auto &staticBuffer : mStaticVertexBuffers) - { - if (staticBuffer->matchesAttribute(attribute, binding)) - { - return staticBuffer.get(); - } - - currentTotalSize += staticBuffer->getBufferSize(); - } - - // Cache size limiting: Clean-up threshold is four times the base buffer size, with a minimum. - ASSERT(getSize() < std::numeric_limits<size_t>::max() / 4u); - size_t sizeThreshold = std::max(getSize() * 4u, static_cast<size_t>(0x1000u)); - - // If we're past the threshold, clear the buffer cache. Note that this will release buffers - // that are currenly bound, and in an edge case can even translate the same attribute twice - // in the same draw call. It will not delete currently bound buffers, however, because they - // are ref counted. - if (currentTotalSize > sizeThreshold) - { - emptyStaticBufferCache(); - } - - // At this point, we must create a new static buffer for the attribute data. - StaticVertexBufferInterface *newStaticBuffer = new StaticVertexBufferInterface(mFactory); - newStaticBuffer->setAttribute(attribute, binding); - mStaticVertexBuffers.push_back(std::unique_ptr<StaticVertexBufferInterface>(newStaticBuffer)); - return newStaticBuffer; -} - -void BufferD3D::invalidateStaticData(const gl::Context *context) -{ - emptyStaticBufferCache(); - - if (mStaticIndexBuffer && mStaticIndexBuffer->getBufferSize() != 0) - { - SafeDelete(mStaticIndexBuffer); - } - - // If the buffer was created with a static usage then we recreate the static - // buffers so that they are populated the next time we use this buffer. - if (mUsage == D3DBufferUsage::STATIC) - { - initializeStaticData(context); - } - - mUnmodifiedDataUse = 0; -} - -// Creates static buffers if sufficient used data has been left unmodified -void BufferD3D::promoteStaticUsage(const gl::Context *context, int dataSize) -{ - if (mUsage == D3DBufferUsage::DYNAMIC) - { - mUnmodifiedDataUse += dataSize; - - if (mUnmodifiedDataUse > 3 * getSize()) - { - updateD3DBufferUsage(context, gl::BufferUsage::StaticDraw); - } - } -} - -gl::Error BufferD3D::getIndexRange(const gl::Context *context, - GLenum type, - size_t offset, - size_t count, - bool primitiveRestartEnabled, - gl::IndexRange *outRange) -{ - const uint8_t *data = nullptr; - ANGLE_TRY(getData(context, &data)); - - *outRange = gl::ComputeIndexRange(type, data + offset, count, primitiveRestartEnabled); - return gl::NoError(); -} - -} // namespace rx |