diff options
Diffstat (limited to 'src/multimediawidgets/qpaintervideosurface.cpp')
| -rw-r--r-- | src/multimediawidgets/qpaintervideosurface.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp index 5fe76d869..6ba7cff02 100644 --- a/src/multimediawidgets/qpaintervideosurface.cpp +++ b/src/multimediawidgets/qpaintervideosurface.cpp @@ -44,7 +44,6 @@ #include <qpainter.h> #include <qvariant.h> #include <qvideosurfaceformat.h> -#include <private/qmediaopenglhelper_p.h> #if QT_CONFIG(opengl) #include <QOpenGLContext> @@ -278,9 +277,8 @@ protected: void initYv12TextureInfo(const QSize &size); bool needsSwizzling(const QVideoSurfaceFormat &format) const { - return !QMediaOpenGLHelper::isANGLE() - && (format.pixelFormat() == QVideoFrame::Format_RGB32 - || format.pixelFormat() == QVideoFrame::Format_ARGB32); + return format.pixelFormat() == QVideoFrame::Format_RGB32 + || format.pixelFormat() == QVideoFrame::Format_ARGB32; } QList<QVideoFrame::PixelFormat> m_imagePixelFormats; @@ -944,16 +942,17 @@ QAbstractVideoSurface::Error QVideoSurfaceArbFpPainter::paint( glActiveTexture(GL_TEXTURE0); } - glVertexPointer(2, GL_FLOAT, 0, v_array); - glTexCoordPointer(2, GL_FLOAT, 0, tx_array); + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, v_array); + glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 0, tx_array); - glEnableClientState(GL_VERTEX_ARRAY); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); + glEnableVertexAttribArray(0); + glEnableVertexAttribArray(1); glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); - glDisableClientState(GL_VERTEX_ARRAY); + glDisableVertexAttribArray(0); + glDisableVertexAttribArray(1); + glDisable(GL_FRAGMENT_PROGRAM_ARB); painter->endNativePainting(); |