1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move QOpenGLBuffer from QtGui to QtOpenGL

Browse Source 
Task-number: QTBUG-74409
Change-Id: I72c839e54f24810b2bde2385c568921c4e4a2869
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2020-01-22 16:33:23 +01:00
parent 57c2c37715
commit 872af6811b
9 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/.prev_CMakeLists.txt
View File

@ -255,7 +255,6 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl
kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h
kernel/qplatformopenglcontext.cpp kernel/qplatformopenglcontext.h kernel/qplatformopenglcontext.cpp kernel/qplatformopenglcontext.h
opengl/qopengl.cpp opengl/qopengl.h opengl/qopengl_p.h opengl/qopengl.cpp opengl/qopengl.h opengl/qopengl_p.h
opengl/qopenglbuffer.cpp opengl/qopenglbuffer.h
opengl/qopenglextensions_p.h opengl/qopenglextensions_p.h
opengl/qopenglextrafunctions.h opengl/qopenglextrafunctions.h
opengl/qopenglfunctions.cpp opengl/qopenglfunctions.h opengl/qopenglfunctions.cpp opengl/qopenglfunctions.h

1
src/gui/CMakeLists.txt
View File

@ -337,7 +337,6 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl
kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h
kernel/qplatformopenglcontext.cpp kernel/qplatformopenglcontext.h kernel/qplatformopenglcontext.cpp kernel/qplatformopenglcontext.h
opengl/qopengl.cpp opengl/qopengl.h opengl/qopengl_p.h opengl/qopengl.cpp opengl/qopengl.h opengl/qopengl_p.h
opengl/qopenglbuffer.cpp opengl/qopenglbuffer.h
opengl/qopenglextensions_p.h opengl/qopenglextensions_p.h
opengl/qopenglextrafunctions.h opengl/qopenglextrafunctions.h
opengl/qopenglfunctions.cpp opengl/qopenglfunctions.h opengl/qopenglfunctions.cpp opengl/qopenglfunctions.h

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

@ -8,7 +8,6 @@ qtConfig(opengl) {
HEADERS += opengl/qopengl.h \ HEADERS += opengl/qopengl.h \
opengl/qopengl_p.h \ opengl/qopengl_p.h \
opengl/qopenglfunctions.h \ opengl/qopenglfunctions.h \
opengl/qopenglbuffer.h \
opengl/qopenglextensions_p.h \ opengl/qopenglextensions_p.h \
opengl/qopenglversionfunctions.h \ opengl/qopenglversionfunctions.h \
opengl/qopenglversionfunctionsfactory_p.h \ opengl/qopenglversionfunctionsfactory_p.h \
@ -17,7 +16,6 @@ qtConfig(opengl) {
SOURCES += opengl/qopengl.cpp \ SOURCES += opengl/qopengl.cpp \
opengl/qopenglfunctions.cpp \ opengl/qopenglfunctions.cpp \
opengl/qopenglbuffer.cpp \
opengl/qopenglversionfunctions.cpp \ opengl/qopenglversionfunctions.cpp \
opengl/qopenglversionfunctionsfactory.cpp \ opengl/qopenglversionfunctionsfactory.cpp \
opengl/qopenglprogrambinarycache.cpp opengl/qopenglprogrambinarycache.cpp

1
src/opengl/CMakeLists.txt
View File

@ -7,6 +7,7 @@
qt_add_module(OpenGL qt_add_module(OpenGL
SOURCES SOURCES
qopengl2pexvertexarray.cpp qopengl2pexvertexarray_p.h qopengl2pexvertexarray.cpp qopengl2pexvertexarray_p.h
qopenglbuffer.cpp qopenglbuffer.h
qopenglcustomshaderstage.cpp qopenglcustomshaderstage_p.h qopenglcustomshaderstage.cpp qopenglcustomshaderstage_p.h
qopengldebug.cpp qopengldebug.h qopengldebug.cpp qopengldebug.h
qopenglengineshadermanager.cpp qopenglengineshadermanager_p.h qopenglengineshadermanager.cpp qopenglengineshadermanager_p.h

2
src/opengl/opengl.pro
View File

@ -10,6 +10,7 @@ qtConfig(opengles2): CONFIG += opengles2
HEADERS += \ HEADERS += \
qopengl2pexvertexarray_p.h \ qopengl2pexvertexarray_p.h \
qopenglbuffer.h \
qopenglcustomshaderstage_p.h \ qopenglcustomshaderstage_p.h \
qopengldebug.h \ qopengldebug.h \
qopenglengineshadermanager_p.h \ qopenglengineshadermanager_p.h \
@ -36,6 +37,7 @@ HEADERS += \
SOURCES += \ SOURCES += \
qopengl2pexvertexarray.cpp \ qopengl2pexvertexarray.cpp \
qopenglbuffer.cpp \
qopenglcustomshaderstage.cpp \ qopenglcustomshaderstage.cpp \
qopenglengineshadermanager.cpp \ qopenglengineshadermanager.cpp \
qopenglframebufferobject.cpp \ qopenglframebufferobject.cpp \

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

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** 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$ ** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage ** Commercial License Usage
@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
\brief The QOpenGLBuffer class provides functions for creating and managing OpenGL buffer objects. \brief The QOpenGLBuffer class provides functions for creating and managing OpenGL buffer objects.
\since 5.0 \since 5.0
\ingroup painting-3D \ingroup painting-3D
\inmodule QtGui \inmodule QtOpenGL
Buffer objects are created in the OpenGL server so that the Buffer objects are created in the OpenGL server so that the
client application can avoid uploading vertices, indices, client application can avoid uploading vertices, indices,

6
src/gui/opengl/qopenglbuffer.h → src/opengl/qopenglbuffer.h
View File

@ -3,7 +3,7 @@
** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/ ** 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$ ** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage ** Commercial License Usage
@ -40,7 +40,7 @@
#ifndef QOPENGLBUFFER_H #ifndef QOPENGLBUFFER_H
#define QOPENGLBUFFER_H #define QOPENGLBUFFER_H
#include <QtGui/qtguiglobal.h> #include <QtOpenGL/qtopenglglobal.h>
#ifndef QT_NO_OPENGL #ifndef QT_NO_OPENGL
@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
class QOpenGLBufferPrivate; class QOpenGLBufferPrivate;
class Q_GUI_EXPORT QOpenGLBuffer class Q_OPENGL_EXPORT QOpenGLBuffer
{ {
public: public:
enum Type enum Type

2
src/opengl/qopengltextureblitter.cpp
View File

@ -41,7 +41,7 @@
#include <QtOpenGL/QOpenGLShaderProgram> #include <QtOpenGL/QOpenGLShaderProgram>
#include <QtOpenGL/QOpenGLVertexArrayObject> #include <QtOpenGL/QOpenGLVertexArrayObject>
#include <QtGui/QOpenGLBuffer> #include <QtOpenGL/QOpenGLBuffer>
#include <QtGui/QOpenGLContext> #include <QtGui/QOpenGLContext>
#include <QtGui/QOpenGLFunctions> #include <QtGui/QOpenGLFunctions>

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

@ -31,10 +31,10 @@
#include <QtOpenGL/QOpenGLTexture> #include <QtOpenGL/QOpenGLTexture>
#include <QtOpenGL/qopengltextureblitter.h> #include <QtOpenGL/qopengltextureblitter.h>
#include <QtOpenGL/QOpenGLVertexArrayObject> #include <QtOpenGL/QOpenGLVertexArrayObject>
#include <QtOpenGL/QOpenGLBuffer>
#include <QtGui/private/qopenglcontext_p.h> #include <QtGui/private/qopenglcontext_p.h>
#include <QtGui/QOpenGLFunctions> #include <QtGui/QOpenGLFunctions>
#include <QtGui/QOpenGLFunctions_4_2_Core> #include <QtGui/QOpenGLFunctions_4_2_Core>
#include <QtGui/QOpenGLBuffer>
#include <QtGui/QPainter> #include <QtGui/QPainter>
#include <QtGui/QScreen> #include <QtGui/QScreen>
#include <QtGui/QWindow> #include <QtGui/QWindow>