diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-07-28 12:20:23 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-07-29 07:21:10 +0000 |
| commit | dd3a08dd539a17e52bb8eec19c9aff27f4de7de4 (patch) | |
| tree | d9f5b7ce0fcf64a3fd4565bfd417c2f35a6af71b /tests/manual/qopengltextureblitter | |
| parent | a89875cd69787a469446523429ff610b45504a72 (diff) | |
Make QOpenGLTextureBlitter public
Change QOpenGLTextureBlitter to be a public API, as it was originally intended.
There are now significant external uses outside qtbase (C++ compositor examples
in QtWayland), and the API is considered proven enough.
[ChangeLog][QtGui] QOpenGLTextureBlitter, a utility class to draw textured quads,
has been made public.
Change-Id: If7a2c94e1494195e2aa375d214932fa7b4c78321
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'tests/manual/qopengltextureblitter')
| -rw-r--r-- | tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp | 4 | ||||
| -rw-r--r-- | tests/manual/qopengltextureblitter/qopengltextureblitwindow.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp b/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp index 63ac1e4e66..f4e093a967 100644 --- a/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp +++ b/tests/manual/qopengltextureblitter/qopengltextureblitwindow.cpp @@ -123,9 +123,9 @@ void QOpenGLTextureBlitWindow::render() m_blitter.blit(texture.textureId(), topRightOriginTopLeftVertex, topLeftOrigin); m_blitter.blit(texture_mirrored.textureId(), bottomLeftOriginTopLeftVertex, topLeftOrigin); - m_blitter.setSwizzleRB(true); + m_blitter.setRedBlueSwizzle(true); m_blitter.blit(texture.textureId(), bottomRightOriginTopLeftVertex, texTopLeftOriginTopLeft); - m_blitter.setSwizzleRB(false); + m_blitter.setRedBlueSwizzle(false); m_blitter.release(); if (m_blitter.supportsExternalOESTarget()) { diff --git a/tests/manual/qopengltextureblitter/qopengltextureblitwindow.h b/tests/manual/qopengltextureblitter/qopengltextureblitwindow.h index 957d833ef3..0912f096e4 100644 --- a/tests/manual/qopengltextureblitter/qopengltextureblitwindow.h +++ b/tests/manual/qopengltextureblitter/qopengltextureblitwindow.h @@ -31,7 +31,7 @@ #include <QtGui/QWindow> #include <QtGui/QOpenGLContext> -#include <QtGui/private/qopengltextureblitter_p.h> +#include <QtGui/QOpenGLTextureBlitter> class QOpenGLTextureBlitWindow : public QWindow { |