peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFrameBufferObject::takeTexture also leaks with Qt 5.15

Browse Source
This commit is contained in:
Uwe Rathmann 2022-06-01 17:50:16 +02:00
parent 5ab536f0e3
commit 86e438a0ed
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/nodes/QskPaintedNode.cpp
View File

@ -18,15 +18,12 @@
QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_BEGIN
#include <private/qsgplaintexture_p.h> #include <private/qsgplaintexture_p.h>
#include <private/qquickwindow_p.h> #include <private/qquickwindow_p.h>
#include <private/qopenglframebufferobject_p.h>
QSK_QT_PRIVATE_END QSK_QT_PRIVATE_END
#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) #if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
#include <qquickopenglutils.h> #include <qquickopenglutils.h>
#endif
QSK_QT_PRIVATE_BEGIN
#include <private/qopenglframebufferobject_p.h>
QSK_QT_PRIVATE_END
static GLuint qskTakeTexture( QOpenGLFramebufferObject& fbo ) static GLuint qskTakeTexture( QOpenGLFramebufferObject& fbo )
{ {
@ -67,15 +64,6 @@ static GLuint qskTakeTexture( QOpenGLFramebufferObject& fbo )
return textureId; return textureId;
} }
#else
static GLuint qskTakeTexture( QOpenGLFramebufferObject& fbo )
{
return fbo.takeTexture();
}
#endif
namespace namespace
{ {
const quint8 imageRole = 250; // reserved for internal use const quint8 imageRole = 250; // reserved for internal use