diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-01 15:39:53 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-03 18:24:29 +0100 |
| commit | 7e872de76ee0591d4fea72f4ef07637ca5f7ca0d (patch) | |
| tree | 32a8bc4e4d06e7af84469a84fd1771ae891a8de1 /src/gui/opengl | |
| parent | 2b15c9c256e5be597cfc3e8165d9b1a9047cfa7c (diff) | |
Fix some typos
Change-Id: I7dbe938bff5ac3ab50a0197f94bdb2f6c22fbd16
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Diffstat (limited to 'src/gui/opengl')
| -rw-r--r-- | src/gui/opengl/qopenglengineshadermanager_p.h | 2 | ||||
| -rw-r--r-- | src/gui/opengl/qopengltimerquery.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/opengl/qopenglengineshadermanager_p.h b/src/gui/opengl/qopenglengineshadermanager_p.h index 49c03a7fee..893574a6e5 100644 --- a/src/gui/opengl/qopenglengineshadermanager_p.h +++ b/src/gui/opengl/qopenglengineshadermanager_p.h @@ -90,7 +90,7 @@ qopenglslMainVertexShader qopenglslMainWithTexCoordsVertexShader - And the the following position vertex shaders: + And the following position vertex shaders: qopenglslPositionOnlyVertexShader qopenglslPositionWithTextureBrushVertexShader qopenglslPositionWithPatternBrushVertexShader diff --git a/src/gui/opengl/qopengltimerquery.cpp b/src/gui/opengl/qopengltimerquery.cpp index deb88b7778..c756e3f527 100644 --- a/src/gui/opengl/qopengltimerquery.cpp +++ b/src/gui/opengl/qopengltimerquery.cpp @@ -283,7 +283,7 @@ GLuint64 QOpenGLTimerQueryPrivate::result() const As this function's name implies, it blocks CPU execution until OpenGL notifies that the timer query result is available. To avoid blocking, you can check if the query result is available by calling isResultAvailable(). Note that - modern GPUs are deeply pipelined and query results may not become availble for + modern GPUs are deeply pipelined and query results may not become available for between 1-5 frames after they were issued. Note that OpenGL does not permit nesting or interleaving of multiple timer queries |