diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-05 09:47:19 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-05 09:47:19 +0200 |
| commit | d5bb02ffe04b9b5ca7d86c8b905b352cc265df32 (patch) | |
| tree | 83831d332763c1974e512de14cfc2757b89a5d84 /src/render/graphicshelpers/graphicscontext_p.h | |
| parent | 4bbdcc1fac6b21a6d4607c93a5f8759145248f07 (diff) | |
| parent | 79aeeba87d3c17b4f652423a660a213f9e2faf25 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
tests/manual/manual.pro
Change-Id: Ie1186d3465516d8d50b8261f72e64d8d454d377b
Diffstat (limited to 'src/render/graphicshelpers/graphicscontext_p.h')
| -rw-r--r-- | src/render/graphicshelpers/graphicscontext_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/render/graphicshelpers/graphicscontext_p.h b/src/render/graphicshelpers/graphicscontext_p.h index d1b21a1d6..92fbac3ec 100644 --- a/src/render/graphicshelpers/graphicscontext_p.h +++ b/src/render/graphicshelpers/graphicscontext_p.h @@ -183,6 +183,7 @@ public: // Wrapper methods void alphaTest(GLenum mode1, GLenum mode2); + void bindFramebuffer(GLuint fbo); void bindBufferBase(GLenum target, GLuint bindingIndex, GLuint buffer); void bindFragOutputs(GLuint shader, const QHash<QString, int> &outputs); void bindUniformBlock(GLuint programId, GLuint uniformBlockIndex, GLuint uniformBlockBinding); |