diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-05 20:40:56 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-05 20:40:56 +0200 |
commit | 6c859cf7b5f1814cfcd3dabb1b82f33c2cf8a649 (patch) | |
tree | 81985e691abb11f120a249c5cfca7354a2aaa184 /examples | |
parent | ee1181115961163a0ba6ac7a7661521c955ec16d (diff) | |
parent | 04f6ff77ef0c8858629766e191ecc3d4ef056848 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I7c3c1fb4535fe13b34a1b056bb16256e7f8057c0
Diffstat (limited to 'examples')
-rw-r--r-- | examples/wayland/minimal-cpp/window.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/examples/wayland/minimal-cpp/window.cpp b/examples/wayland/minimal-cpp/window.cpp index f0d0fd5d9..a23bba3ae 100644 --- a/examples/wayland/minimal-cpp/window.cpp +++ b/examples/wayland/minimal-cpp/window.cpp @@ -86,7 +86,8 @@ void Window::paintGL() functions->glClearColor(.4f, .7f, .1f, 0.5f); functions->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - m_textureBlitter.bind(); + GLenum currentTarget = GL_TEXTURE_2D; + m_textureBlitter.bind(currentTarget); functions->glEnable(GL_BLEND); functions->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -96,6 +97,10 @@ void Window::paintGL() auto texture = view->getTexture(); if (!texture) continue; + if (texture->target() != currentTarget) { + currentTarget = texture->target(); + m_textureBlitter.bind(currentTarget); + } GLuint textureId = texture->textureId(); QWaylandSurface *surface = view->surface(); if (surface && surface->hasContent()) { |