diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:51 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:52 +0200 |
| commit | 881ceeff428c377d02ae3881beccdbb028385075 (patch) | |
| tree | 65bd4335d7f67b81b04e33f2cbb17a41cf966dd8 /src/opengl/qglshaderprogram.cpp | |
| parent | b3d2c867ed14cd6337d5e32b8750f198b5b7d331 (diff) | |
| parent | 106487387d493dab934e19b33bfed55b8df62d67 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14
Diffstat (limited to 'src/opengl/qglshaderprogram.cpp')
| -rw-r--r-- | src/opengl/qglshaderprogram.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index e0149a2c87..32140f06e6 100644 --- a/src/opengl/qglshaderprogram.cpp +++ b/src/opengl/qglshaderprogram.cpp @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE \snippet code/src_opengl_qglshaderprogram.cpp 0 - \section1 Writing portable shaders + \section1 Writing Portable Shaders Shader programs can be difficult to reuse across OpenGL implementations because of varying levels of support for standard vertex attributes and @@ -90,7 +90,7 @@ QT_BEGIN_NAMESPACE to just features that are present in GLSL/ES, and avoid standard variable names that only work on the desktop. - \section1 Simple shader example + \section1 Simple Shader Example \snippet code/src_opengl_qglshaderprogram.cpp 1 @@ -99,7 +99,7 @@ QT_BEGIN_NAMESPACE \snippet code/src_opengl_qglshaderprogram.cpp 2 - \section1 Binary shaders and programs + \section1 Binary Shaders and Programs Binary shaders may be specified using \c{glShaderBinary()} on the return value from QGLShader::shaderId(). The QGLShader instance |