Skip to content

Commit

Permalink
Add QOpenGLTimerQuery and QOpenGLTimeMonitor classes
Browse files Browse the repository at this point in the history 
QOpenGLTimerQuery encapsulates a single OpenGL timer query object.

QOpenGLTimeMonitor is a convenience wrapper around a sequence of
OpenGL timer query objects that can be used to profile OpenGL
rendering code or to allow real-time adaptation of rendering
methods based upon run-time performance.

Change-Id: I873e591927080dea2b079b0e2a1eb9fed15c0372
Reviewed-by: Samuel Rødal <[email protected]>
Reviewed-by: James Turner <[email protected]>
  • Loading branch information
@seanharmer
seanharmer authored and The Qt Project committed Mar 12, 2013
1 parent a410273 commit 771286e
Show file tree
Hide file tree
Showing 4 changed files with 1,174 additions and 3 deletions.
8 changes: 5 additions & 3 deletions src/gui/opengl/opengl.pri
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) {
opengl/qopenglversionfunctionsfactory.cpp \
opengl/qopenglvertexarrayobject.cpp


!contains(QT_CONFIG, opengles2) {
HEADERS += opengl/qopenglfunctions_1_0.h \
opengl/qopenglfunctions_1_1.h \
Expand All @@ -74,7 +73,9 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) {
opengl/qopenglfunctions_4_0_compatibility.h \
opengl/qopenglfunctions_4_1_compatibility.h \
opengl/qopenglfunctions_4_2_compatibility.h \
opengl/qopenglfunctions_4_3_compatibility.h
opengl/qopenglfunctions_4_3_compatibility.h \
opengl/qopenglqueryhelper_p.h \
opengl/qopengltimerquery.h

SOURCES += opengl/qopenglfunctions_1_0.cpp \
opengl/qopenglfunctions_1_1.cpp \
Expand All @@ -97,7 +98,8 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) {
opengl/qopenglfunctions_4_0_compatibility.cpp \
opengl/qopenglfunctions_4_1_compatibility.cpp \
opengl/qopenglfunctions_4_2_compatibility.cpp \
opengl/qopenglfunctions_4_3_compatibility.cpp
opengl/qopenglfunctions_4_3_compatibility.cpp \
opengl/qopengltimerquery.cpp
}

contains(QT_CONFIG, opengles2) {
Expand Down
177 changes: 177 additions & 0 deletions src/gui/opengl/qopenglqueryhelper_p.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
/****************************************************************************
**
** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtGui module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
****************************************************************************/

#ifndef QOPENGLQUERYHELPER_P_H
#define QOPENGLQUERYHELPER_P_H

#include <QtCore/qglobal.h>

#if !defined(QT_OPENGL_ES_2)

#include <QtGui/QOpenGLContext>

QT_BEGIN_NAMESPACE

// Helper class used by QOpenGLTimerQuery and later will be used by
// QOpenGLOcclusionQuery
class QOpenGLQueryHelper
{
public:
QOpenGLQueryHelper(QOpenGLContext *context)
: GetQueryObjectuiv(0),
GetQueryObjectiv(0),
GetQueryiv(0),
EndQuery(0),
BeginQuery(0),
IsQuery(0),
DeleteQueries(0),
GenQueries(0),
GetInteger64v(0),
GetQueryObjectui64v(0),
GetQueryObjecti64v(0),
QueryCounter(0)
{
Q_ASSERT(context);

// Core in OpenGL >=1.5
GetQueryObjectuiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint *)>(context->getProcAddress("glGetQueryObjectuiv"));
GetQueryObjectiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint *)>(context->getProcAddress("glGetQueryObjectiv"));
GetQueryiv = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLenum , GLint *)>(context->getProcAddress("glGetQueryiv"));
EndQuery = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum )>(context->getProcAddress("glEndQuery"));
BeginQuery = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLuint )>(context->getProcAddress("glBeginQuery"));
IsQuery = reinterpret_cast<GLboolean (QOPENGLF_APIENTRYP)(GLuint )>(context->getProcAddress("glIsQuery"));
DeleteQueries = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , const GLuint *)>(context->getProcAddress("glDeleteQueries"));
GenQueries = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLsizei , GLuint *)>(context->getProcAddress("glGenQueries"));

// Core in OpenGL >=3.2
GetInteger64v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLenum , GLint64 *)>(context->getProcAddress("glGetInteger64v"));

// Core in OpenGL >=3.3 / ARB_timer_query
GetQueryObjectui64v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLuint64 *)>(context->getProcAddress("glGetQueryObjectui64v"));
GetQueryObjecti64v = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum , GLint64 *)>(context->getProcAddress("glGetQueryObjecti64v"));
QueryCounter = reinterpret_cast<void (QOPENGLF_APIENTRYP)(GLuint , GLenum )>(context->getProcAddress("glQueryCounter"));
}

inline void glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
{
GetQueryObjectuiv(id, pname, params);
}

inline void glGetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
{
GetQueryObjectiv(id, pname, params);
}

inline void glGetQueryiv(GLenum target, GLenum pname, GLint *params)
{
GetQueryiv(target, pname, params);
}

inline void glEndQuery(GLenum target)
{
EndQuery(target);
}

inline void glBeginQuery(GLenum target, GLuint id)
{
BeginQuery(target, id);
}

inline GLboolean glIsQuery(GLuint id)
{
return IsQuery(id);
}

inline void glDeleteQueries(GLsizei n, const GLuint *ids)
{
DeleteQueries(n, ids);
}

inline void glGenQueries(GLsizei n, GLuint *ids)
{
GenQueries(n, ids);
}

inline void glGetInteger64v(GLenum pname, GLint64 *params)
{
GetInteger64v(pname, params);
}

inline void glGetQueryObjectui64v(GLuint id, GLenum pname, GLuint64 *params)
{
GetQueryObjectui64v(id, pname, params);
}

inline void glGetQueryObjecti64v(GLuint id, GLenum pname, GLint64 *params)
{
GetQueryObjecti64v(id, pname, params);
}

inline void glQueryCounter(GLuint id, GLenum target)
{
QueryCounter(id, target);
}

private:
// Core in OpenGL >=1.5
void (QOPENGLF_APIENTRYP GetQueryObjectuiv)(GLuint id, GLenum pname, GLuint *params);
void (QOPENGLF_APIENTRYP GetQueryObjectiv)(GLuint id, GLenum pname, GLint *params);
void (QOPENGLF_APIENTRYP GetQueryiv)(GLenum target, GLenum pname, GLint *params);
void (QOPENGLF_APIENTRYP EndQuery)(GLenum target);
void (QOPENGLF_APIENTRYP BeginQuery)(GLenum target, GLuint id);
GLboolean (QOPENGLF_APIENTRYP IsQuery)(GLuint id);
void (QOPENGLF_APIENTRYP DeleteQueries)(GLsizei n, const GLuint *ids);
void (QOPENGLF_APIENTRYP GenQueries)(GLsizei n, GLuint *ids);

// Core in OpenGL >=3.2
void (QOPENGLF_APIENTRYP GetInteger64v)(GLenum pname, GLint64 *params);

// Core in OpenGL >=3.3 and provided by ARB_timer_query
void (QOPENGLF_APIENTRYP GetQueryObjectui64v)(GLuint id, GLenum pname, GLuint64 *params);
void (QOPENGLF_APIENTRYP GetQueryObjecti64v)(GLuint id, GLenum pname, GLint64 *params);
void (QOPENGLF_APIENTRYP QueryCounter)(GLuint id, GLenum target);
};

QT_END_NAMESPACE

#endif

#endif // QOPENGLQUERYHELPER_P_H
Loading

0 comments on commit 771286e

Please sign in to comment.