summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/angle/src/libANGLE/renderer/TextureImpl.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/libANGLE/renderer/TextureImpl.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/libANGLE/renderer/TextureImpl.h')
-rw-r--r--src/3rdparty/angle/src/libANGLE/renderer/TextureImpl.h159
1 files changed, 0 insertions, 159 deletions
diff --git a/src/3rdparty/angle/src/libANGLE/renderer/TextureImpl.h b/src/3rdparty/angle/src/libANGLE/renderer/TextureImpl.h
deleted file mode 100644
index 3b4f28f5f7..0000000000
--- a/src/3rdparty/angle/src/libANGLE/renderer/TextureImpl.h
+++ /dev/null
@@ -1,159 +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.
-//
-
-// TextureImpl.h: Defines the abstract rx::TextureImpl classes.
-
-#ifndef LIBANGLE_RENDERER_TEXTUREIMPL_H_
-#define LIBANGLE_RENDERER_TEXTUREIMPL_H_
-
-#include <stdint.h>
-
-#include "angle_gl.h"
-#include "common/angleutils.h"
-#include "libANGLE/Error.h"
-#include "libANGLE/ImageIndex.h"
-#include "libANGLE/Stream.h"
-#include "libANGLE/Texture.h"
-#include "libANGLE/renderer/FramebufferAttachmentObjectImpl.h"
-
-namespace egl
-{
-class Surface;
-class Image;
-}
-
-namespace gl
-{
-struct Box;
-struct Extents;
-struct Offset;
-struct Rectangle;
-class Framebuffer;
-struct PixelUnpackState;
-struct TextureState;
-}
-
-namespace rx
-{
-class ContextImpl;
-
-class TextureImpl : public FramebufferAttachmentObjectImpl
-{
- public:
- TextureImpl(const gl::TextureState &state);
- ~TextureImpl() override;
-
- virtual gl::Error onDestroy(const gl::Context *context);
-
- virtual gl::Error setImage(const gl::Context *context,
- GLenum target,
- size_t level,
- GLenum internalFormat,
- const gl::Extents &size,
- GLenum format,
- GLenum type,
- const gl::PixelUnpackState &unpack,
- const uint8_t *pixels) = 0;
- virtual gl::Error setSubImage(const gl::Context *context,
- GLenum target,
- size_t level,
- const gl::Box &area,
- GLenum format,
- GLenum type,
- const gl::PixelUnpackState &unpack,
- const uint8_t *pixels) = 0;
-
- virtual gl::Error setCompressedImage(const gl::Context *context,
- GLenum target,
- size_t level,
- GLenum internalFormat,
- const gl::Extents &size,
- const gl::PixelUnpackState &unpack,
- size_t imageSize,
- const uint8_t *pixels) = 0;
- virtual gl::Error setCompressedSubImage(const gl::Context *context,
- GLenum target,
- size_t level,
- const gl::Box &area,
- GLenum format,
- const gl::PixelUnpackState &unpack,
- size_t imageSize,
- const uint8_t *pixels) = 0;
-
- virtual gl::Error copyImage(const gl::Context *context,
- GLenum target,
- size_t level,
- const gl::Rectangle &sourceArea,
- GLenum internalFormat,
- const gl::Framebuffer *source) = 0;
- virtual gl::Error copySubImage(const gl::Context *context,
- GLenum target,
- size_t level,
- const gl::Offset &destOffset,
- const gl::Rectangle &sourceArea,
- const gl::Framebuffer *source) = 0;
-
- virtual gl::Error copyTexture(const gl::Context *context,
- GLenum target,
- size_t level,
- GLenum internalFormat,
- GLenum type,
- size_t sourceLevel,
- bool unpackFlipY,
- bool unpackPremultiplyAlpha,
- bool unpackUnmultiplyAlpha,
- const gl::Texture *source);
- virtual gl::Error copySubTexture(const gl::Context *context,
- GLenum target,
- size_t level,
- const gl::Offset &destOffset,
- size_t sourceLevel,
- const gl::Rectangle &sourceArea,
- bool unpackFlipY,
- bool unpackPremultiplyAlpha,
- bool unpackUnmultiplyAlpha,
- const gl::Texture *source);
-
- virtual gl::Error copyCompressedTexture(const gl::Context *context, const gl::Texture *source);
-
- virtual gl::Error setStorage(const gl::Context *context,
- GLenum target,
- size_t levels,
- GLenum internalFormat,
- const gl::Extents &size) = 0;
-
- virtual gl::Error setStorageMultisample(const gl::Context *context,
- GLenum target,
- GLsizei samples,
- GLint internalformat,
- const gl::Extents &size,
- bool fixedSampleLocations) = 0;
-
- virtual gl::Error setEGLImageTarget(const gl::Context *context,
- GLenum target,
- egl::Image *image) = 0;
-
- virtual gl::Error setImageExternal(const gl::Context *context,
- GLenum target,
- egl::Stream *stream,
- const egl::Stream::GLTextureDescription &desc) = 0;
-
- virtual gl::Error generateMipmap(const gl::Context *context) = 0;
-
- virtual gl::Error setBaseLevel(const gl::Context *context, GLuint baseLevel) = 0;
-
- virtual gl::Error bindTexImage(const gl::Context *context, egl::Surface *surface) = 0;
- virtual gl::Error releaseTexImage(const gl::Context *context) = 0;
-
- virtual void syncState(const gl::Texture::DirtyBits &dirtyBits) = 0;
-
- protected:
- const gl::TextureState &mState;
-};
-
-}
-
-#endif // LIBANGLE_RENDERER_TEXTUREIMPL_H_