From 75a27a1ab03801bf040c6f901d5dc3af2434b91e Mon Sep 17 00:00:00 2001 From: VaL Doroshchuk Date: Thu, 28 May 2020 10:50:31 +0200 Subject: Remove deprecated gl funcs glTexCoordPointer, glVertexPointer, glEnableClientState, glDisableClientState Change-Id: I9970a64131e9372b7db48895912b9f481e34bf1a Reviewed-by: Laszlo Agocs --- src/multimediawidgets/qpaintervideosurface.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/multimediawidgets') diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp index 5fe76d869..590864c7e 100644 --- a/src/multimediawidgets/qpaintervideosurface.cpp +++ b/src/multimediawidgets/qpaintervideosurface.cpp @@ -944,16 +944,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(); -- cgit v1.2.3