AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move QOpenGLTextureBlitter from QtGui to QtOpenGL

Browse Source 
Task-number: QTBUG-74409
Change-Id: Ie4a3dfd01ba44715de6da71c4420fe9a95a0c242
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2020-01-17 14:15:29 +01:00
parent 35262678c3
commit fcaa7506ba
11 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/opengl/opengl.pri
View File

@ -16,7 +16,6 @@ qtConfig(opengl) {
opengl/qopenglversionfunctions.h \
opengl/qopenglversionfunctionsfactory_p.h \
opengl/qopenglvertexarrayobject.h \
opengl/qopengltextureblitter.h \
opengl/qopenglextrafunctions.h \
opengl/qopenglprogrambinarycache_p.h
@ -28,7 +27,6 @@ qtConfig(opengl) {
opengl/qopenglversionfunctions.cpp \
opengl/qopenglversionfunctionsfactory.cpp \
opengl/qopenglvertexarrayobject.cpp \
opengl/qopengltextureblitter.cpp \
opengl/qopenglprogrambinarycache.cpp
!qtConfig(opengles2) {

2
src/opengl/opengl.pro
View File

@ -24,6 +24,7 @@ HEADERS += \
qopengltexture.h \
qopengltexture_p.h \
qopengltexturehelper_p.h \
qopengltextureblitter.h \
qopengltexturecache_p.h \
qopengltextureglyphcache_p.h \
qopengltextureuploader_p.h \
@ -40,6 +41,7 @@ SOURCES += \
qopenglpixeltransferoptions.cpp \
qopengltexture.cpp \
qopengltexturehelper.cpp \
qopengltextureblitter.cpp \
qopengltexturecache.cpp \
qopengltextureglyphcache.cpp \
qopengltextureuploader.cpp \

4
src/gui/opengl/qopengltextureblitter.cpp → src/opengl/qopengltextureblitter.cpp
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
\brief The QOpenGLTextureBlitter class provides a convenient way to draw textured quads via OpenGL.
\since 5.8
\ingroup painting-3D
\inmodule QtGui
\inmodule QtOpenGL
Drawing textured quads, in order to get the contents of a texture
onto the screen, is a common operation when developing 2D user

10
src/gui/opengl/qopengltextureblitter.h → src/opengl/qopengltextureblitter.h
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
** This file is part of the QtOpenGL module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
@ -40,9 +40,7 @@
#ifndef QOPENGLTEXTUREBLITTER_H
#define QOPENGLTEXTUREBLITTER_H
#include <QtGui/qtguiglobal.h>
#ifndef QT_NO_OPENGL
#include <QtOpenGL/qtopenglglobal.h>
#include <QtGui/qopengl.h>
#include <QtGui/QMatrix3x3>
@ -52,7 +50,7 @@ QT_BEGIN_NAMESPACE
class QOpenGLTextureBlitterPrivate;
class Q_GUI_EXPORT QOpenGLTextureBlitter
class Q_OPENGL_EXPORT QOpenGLTextureBlitter
{
public:
QOpenGLTextureBlitter();
@ -89,6 +87,4 @@ private:
QT_END_NAMESPACE
#endif
#endif //QOPENGLTEXTUREBLITTER_H

2
src/opengl/qopenglwindow.cpp
View File

@ -40,12 +40,12 @@
#include "qopenglwindow.h"
#include <QtGui/QOpenGLFramebufferObject>
#include <QtGui/QOpenGLFunctions>
#include <QtGui/QOpenGLTextureBlitter>
#include <QtGui/private/qpaintdevicewindow_p.h>
#include <QtGui/private/qopenglextensions_p.h>
#include <QtGui/private/qopenglcontext_p.h>
#include <QtGui/QMatrix4x4>
#include <QtGui/QOffscreenSurface>
#include <QtOpenGL/QOpenGLTextureBlitter>
#include <QtOpenGL/QOpenGLPaintDevice>
QT_BEGIN_NAMESPACE

2
src/platformsupport/platformcompositor/platformcompositor.pro
View File

@ -1,7 +1,7 @@
TARGET = QtPlatformCompositorSupport
MODULE = platformcompositor_support
QT = core-private gui-private
QT = core-private gui-private opengl
CONFIG += static internal_module
DEFINES += QT_NO_CAST_FROM_ASCII

2
src/platformsupport/platformcompositor/qopenglcompositor_p.h
View File

@ -52,7 +52,7 @@
//
#include <QtCore/QTimer>
#include <QtGui/QOpenGLTextureBlitter>
#include <QtOpenGL/QOpenGLTextureBlitter>
#include <QtGui/QMatrix4x4>
QT_BEGIN_NAMESPACE

3
src/platformsupport/platformcompositor/qplatformbackingstoreopenglsupport.cpp
View File

@ -46,11 +46,10 @@
#include <qpa/qplatformgraphicsbuffer.h>
#include <qpa/qplatformgraphicsbufferhelper.h>
#include <QtOpenGL/QOpenGLTextureBlitter>
#include <QtGui/qopengl.h>
#include <QtGui/QOpenGLFunctions>
#include <QtGui/QOpenGLContext>
#include <QtGui/QOpenGLTextureBlitter>
#include <QtGui/QOffscreenSurface>
#ifndef GL_TEXTURE_BASE_LEVEL

1
src/plugins/platforms/wasm/qwasmcompositor.cpp
View File

@ -36,7 +36,6 @@
#include <QtGui/private/qwindow_p.h>
#include <QtGui/qopenglcontext.h>
#include <QtGui/qopenglfunctions.h>
#include <QtGui/qopengltextureblitter.h>
#include <QtGui/qoffscreensurface.h>
#include <QtGui/qpainter.h>
#include <private/qpixmapcache_p.h>

3
src/plugins/platforms/wasm/qwasmcompositor.h
View File

@ -33,7 +33,7 @@
#include <QtGui/qregion.h>
#include <qpa/qplatformwindow.h>
#include <QtGui/qopengltextureblitter.h>
#include <QtOpenGL/qopengltextureblitter.h>
#include <QtGui/qpalette.h>
#include <QtGui/qpainter.h>
@ -43,7 +43,6 @@ class QWasmWindow;
class QWasmScreen;
class QOpenGLContext;
class QOpenGLTexture;
class QOpenGLTextureBlitter;
class QWasmCompositedWindow
{

2
tests/auto/gui/qopengl/tst_qopengl.cpp
View File

@ -28,6 +28,7 @@
#include <QtOpenGL/QOpenGLPaintDevice>
#include <QtOpenGL/QOpenGLTexture>
#include <QtOpenGL/qopengltextureblitter.h>
#include <QtGui/private/qopenglcontext_p.h>
#include <QtGui/QOpenGLFramebufferObject>
#include <QtGui/QOpenGLFunctions>
@ -40,7 +41,6 @@
#include <QtGui/QOffscreenSurface>
#include <QtGui/QGenericMatrix>
#include <QtGui/QMatrix4x4>
#include <QtGui/qopengltextureblitter.h>
#include <QtGui/private/qguiapplication_p.h>
#include <QtGui/private/qopenglextensions_p.h>
#include <qpa/qplatformintegration.h>