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/d3d11/Framebuffer11.h | |
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/d3d11/Framebuffer11.h')
-rw-r--r-- | src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.h | 104 |
1 files changed, 0 insertions, 104 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.h b/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.h deleted file mode 100644 index afdda299b9..0000000000 --- a/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.h +++ /dev/null @@ -1,104 +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. -// - -// Framebuffer11.h: Defines the Framebuffer11 class. - -#ifndef LIBANGLE_RENDERER_D3D_D3D11_FRAMBUFFER11_H_ -#define LIBANGLE_RENDERER_D3D_D3D11_FRAMBUFFER11_H_ - -#include "libANGLE/renderer/d3d/FramebufferD3D.h" -#include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h" -#include "libANGLE/signal_utils.h" - -namespace rx -{ -class Renderer11; - -class Framebuffer11 : public FramebufferD3D, public OnRenderTargetDirtyReceiver -{ - public: - Framebuffer11(const gl::FramebufferState &data, Renderer11 *renderer); - ~Framebuffer11() override; - - gl::Error discard(const gl::Context *context, size_t count, const GLenum *attachments) override; - gl::Error invalidate(const gl::Context *context, - size_t count, - const GLenum *attachments) override; - gl::Error invalidateSub(const gl::Context *context, - size_t count, - const GLenum *attachments, - const gl::Rectangle &area) override; - - // Invalidate the cached swizzles of all bound texture attachments. - gl::Error markAttachmentsDirty(const gl::Context *context) const; - - void syncState(const gl::Context *context, - const gl::Framebuffer::DirtyBits &dirtyBits) override; - - const RenderTargetArray &getCachedColorRenderTargets() const - { - return mCachedColorRenderTargets; - } - const RenderTarget11 *getCachedDepthStencilRenderTarget() const - { - return mCachedDepthStencilRenderTarget; - } - - RenderTarget11 *getFirstRenderTarget() const; - - bool hasAnyInternalDirtyBit() const; - void syncInternalState(const gl::Context *context); - - void signal(size_t channelID, const gl::Context *context) override; - - gl::Error getSamplePosition(size_t index, GLfloat *xy) const override; - - private: - gl::Error clearImpl(const gl::Context *context, const ClearParameters &clearParams) override; - - gl::Error readPixelsImpl(const gl::Context *context, - const gl::Rectangle &area, - GLenum format, - GLenum type, - size_t outputPitch, - const gl::PixelPackState &pack, - uint8_t *pixels) override; - - gl::Error blitImpl(const gl::Context *context, - const gl::Rectangle &sourceArea, - const gl::Rectangle &destArea, - const gl::Rectangle *scissor, - bool blitRenderTarget, - bool blitDepth, - bool blitStencil, - GLenum filter, - const gl::Framebuffer *sourceFramebuffer) override; - - gl::Error invalidateBase(const gl::Context *context, - size_t count, - const GLenum *attachments, - bool useEXTBehavior) const; - gl::Error invalidateAttachment(const gl::Context *context, - const gl::FramebufferAttachment *attachment) const; - - GLenum getRenderTargetImplementationFormat(RenderTargetD3D *renderTarget) const override; - - void updateColorRenderTarget(const gl::Context *context, size_t colorIndex); - void updateDepthStencilRenderTarget(const gl::Context *context); - - Renderer11 *const mRenderer; - RenderTargetArray mCachedColorRenderTargets; - RenderTarget11 *mCachedDepthStencilRenderTarget; - - std::vector<OnRenderTargetDirtyBinding> mColorRenderTargetsDirty; - OnRenderTargetDirtyBinding mDepthStencilRenderTargetDirty; - - gl::Framebuffer::DirtyBits mInternalDirtyBits; -}; - -} - -#endif // LIBANGLE_RENDERER_D3D_D3D11_FRAMBUFFER11_H_ |