Move QOpenGLBuffer from QtGui to QtOpenGL
Task-number: QTBUG-74409 Change-Id: I72c839e54f24810b2bde2385c568921c4e4a2869 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
parent
57c2c37715
commit
872af6811b
@ -255,7 +255,6 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl
|
||||
kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h
|
||||
kernel/qplatformopenglcontext.cpp kernel/qplatformopenglcontext.h
|
||||
opengl/qopengl.cpp opengl/qopengl.h opengl/qopengl_p.h
|
||||
opengl/qopenglbuffer.cpp opengl/qopenglbuffer.h
|
||||
opengl/qopenglextensions_p.h
|
||||
opengl/qopenglextrafunctions.h
|
||||
opengl/qopenglfunctions.cpp opengl/qopenglfunctions.h
|
||||
|
@ -337,7 +337,6 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl
|
||||
kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h
|
||||
kernel/qplatformopenglcontext.cpp kernel/qplatformopenglcontext.h
|
||||
opengl/qopengl.cpp opengl/qopengl.h opengl/qopengl_p.h
|
||||
opengl/qopenglbuffer.cpp opengl/qopenglbuffer.h
|
||||
opengl/qopenglextensions_p.h
|
||||
opengl/qopenglextrafunctions.h
|
||||
opengl/qopenglfunctions.cpp opengl/qopenglfunctions.h
|
||||
|
@ -8,7 +8,6 @@ qtConfig(opengl) {
|
||||
HEADERS += opengl/qopengl.h \
|
||||
opengl/qopengl_p.h \
|
||||
opengl/qopenglfunctions.h \
|
||||
opengl/qopenglbuffer.h \
|
||||
opengl/qopenglextensions_p.h \
|
||||
opengl/qopenglversionfunctions.h \
|
||||
opengl/qopenglversionfunctionsfactory_p.h \
|
||||
@ -17,7 +16,6 @@ qtConfig(opengl) {
|
||||
|
||||
SOURCES += opengl/qopengl.cpp \
|
||||
opengl/qopenglfunctions.cpp \
|
||||
opengl/qopenglbuffer.cpp \
|
||||
opengl/qopenglversionfunctions.cpp \
|
||||
opengl/qopenglversionfunctionsfactory.cpp \
|
||||
opengl/qopenglprogrambinarycache.cpp
|
||||
|
@ -7,6 +7,7 @@
|
||||
qt_add_module(OpenGL
|
||||
SOURCES
|
||||
qopengl2pexvertexarray.cpp qopengl2pexvertexarray_p.h
|
||||
qopenglbuffer.cpp qopenglbuffer.h
|
||||
qopenglcustomshaderstage.cpp qopenglcustomshaderstage_p.h
|
||||
qopengldebug.cpp qopengldebug.h
|
||||
qopenglengineshadermanager.cpp qopenglengineshadermanager_p.h
|
||||
|
@ -10,6 +10,7 @@ qtConfig(opengles2): CONFIG += opengles2
|
||||
|
||||
HEADERS += \
|
||||
qopengl2pexvertexarray_p.h \
|
||||
qopenglbuffer.h \
|
||||
qopenglcustomshaderstage_p.h \
|
||||
qopengldebug.h \
|
||||
qopenglengineshadermanager_p.h \
|
||||
@ -36,6 +37,7 @@ HEADERS += \
|
||||
|
||||
SOURCES += \
|
||||
qopengl2pexvertexarray.cpp \
|
||||
qopenglbuffer.cpp \
|
||||
qopenglcustomshaderstage.cpp \
|
||||
qopenglengineshadermanager.cpp \
|
||||
qopenglframebufferobject.cpp \
|
||||
|
@ -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
|
||||
@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
|
||||
\brief The QOpenGLBuffer class provides functions for creating and managing OpenGL buffer objects.
|
||||
\since 5.0
|
||||
\ingroup painting-3D
|
||||
\inmodule QtGui
|
||||
\inmodule QtOpenGL
|
||||
|
||||
Buffer objects are created in the OpenGL server so that the
|
||||
client application can avoid uploading vertices, indices,
|
@ -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,7 +40,7 @@
|
||||
#ifndef QOPENGLBUFFER_H
|
||||
#define QOPENGLBUFFER_H
|
||||
|
||||
#include <QtGui/qtguiglobal.h>
|
||||
#include <QtOpenGL/qtopenglglobal.h>
|
||||
|
||||
#ifndef QT_NO_OPENGL
|
||||
|
||||
@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
|
||||
|
||||
class QOpenGLBufferPrivate;
|
||||
|
||||
class Q_GUI_EXPORT QOpenGLBuffer
|
||||
class Q_OPENGL_EXPORT QOpenGLBuffer
|
||||
{
|
||||
public:
|
||||
enum Type
|
@ -41,7 +41,7 @@
|
||||
|
||||
#include <QtOpenGL/QOpenGLShaderProgram>
|
||||
#include <QtOpenGL/QOpenGLVertexArrayObject>
|
||||
#include <QtGui/QOpenGLBuffer>
|
||||
#include <QtOpenGL/QOpenGLBuffer>
|
||||
#include <QtGui/QOpenGLContext>
|
||||
#include <QtGui/QOpenGLFunctions>
|
||||
|
||||
|
@ -31,10 +31,10 @@
|
||||
#include <QtOpenGL/QOpenGLTexture>
|
||||
#include <QtOpenGL/qopengltextureblitter.h>
|
||||
#include <QtOpenGL/QOpenGLVertexArrayObject>
|
||||
#include <QtOpenGL/QOpenGLBuffer>
|
||||
#include <QtGui/private/qopenglcontext_p.h>
|
||||
#include <QtGui/QOpenGLFunctions>
|
||||
#include <QtGui/QOpenGLFunctions_4_2_Core>
|
||||
#include <QtGui/QOpenGLBuffer>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtGui/QScreen>
|
||||
#include <QtGui/QWindow>
|
||||
|
Loading…
x
Reference in New Issue
Block a user