diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-05 13:58:50 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-05 13:58:50 +0200 |
| commit | 6c77dea4711b6a88e80e30db21d622808e5ef9b6 (patch) | |
| tree | 7f03934b19f5782447da135aeceb4269298e3f2a /src/render/renderers/opengl/renderer/openglvertexarrayobject.cpp | |
| parent | edc88e97721c0a223a2b77cec217f550f08a4135 (diff) | |
| parent | d8789d8fd17fd58f06003e9846b3d107ffc8ec52 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I2a92242b0d6be4f4e7f07f0f020fa6751ada9bc3
Diffstat (limited to 'src/render/renderers/opengl/renderer/openglvertexarrayobject.cpp')
| -rw-r--r-- | src/render/renderers/opengl/renderer/openglvertexarrayobject.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/render/renderers/opengl/renderer/openglvertexarrayobject.cpp b/src/render/renderers/opengl/renderer/openglvertexarrayobject.cpp index 0c4fd8c9d..f5d0a64f5 100644 --- a/src/render/renderers/opengl/renderer/openglvertexarrayobject.cpp +++ b/src/render/renderers/opengl/renderer/openglvertexarrayobject.cpp @@ -108,6 +108,11 @@ void OpenGLVertexArrayObject::create(SubmissionContext *ctx, const VAOIdentifier m_owners = key; } +VAOIdentifier OpenGLVertexArrayObject::key() const +{ + return m_owners; +} + // called from Render thread void OpenGLVertexArrayObject::destroy() { |