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

OpenGL: Update QOpenGLFunctions docs to remove widget code

Browse Source 
Change-Id: I4246a49444c09d899f2bd7cd2e9353ee0a6859bf
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
This commit is contained in:
Sean Harmer 2012-06-08 11:18:18 +01:00 committed by Qt by Nokia
parent 9e9ea7c0e6
commit 6a66f29ead
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/gui/opengl/qopenglfunctions.cpp
View File

@ -64,19 +64,37 @@ QT_BEGIN_NAMESPACE
direct inheritance:
\code
class MyGLWidget : public QOpenGLWidget, protected QOpenGLFunctions
class MyGLWindow : public QWindow, protected QOpenGLFunctions
{
Q_OBJECT
public:
MyGLWidget(QWidget *parent = 0) : QOpenGLWidget(parent) {}
MyGLWindow(QScreen *screen = 0);
protected:
void initializeGL();
void paintGL();
QOpenGLContext *m_context;
};
void MyGLWidget::initializeGL()
MyGLWindow(QScreen *screen)
: QWindow(screen), QOpenGLWidget(parent)
{
setSurfaceType(OpenGLSurface);
create();
// Create an OpenGL context
m_context = new QOpenGLContext;
m_context->create();
// Setup scene and render it
initializeGL();
paintGL()
}
void MyGLWindow::initializeGL()
{
m_context->makeCurrent(this);
initializeGLFunctions();
}
\endcode
@ -86,11 +104,14 @@ QT_BEGIN_NAMESPACE
in the following example:
\code
void MyGLWidget::paintGL()
void MyGLWindow::paintGL()
{
m_context->makeCurrent(this);
glActiveTexture(GL_TEXTURE1);
glBindTexture(GL_TEXTURE_2D, textureId);
...
m_context->swapBuffers(this);
m_context->doneCurrent();
}
\endcode