whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid nullptr deref in Q_ASSERTS 

Found by Coverity, CIDs: [159014-159383]. Indeed, Q_ASSERTS can
go into the block controlled by the corresponding if-statements,
otherwise - why 'if' at all?

Change-Id: Ibc99cd48b97287ec132e082d14f3c39350d547f9
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
bb10
Timur Pocheptsov 2016-04-18 12:31:49 +02:00
parent 8026dc6f36
commit 0458224743
24 changed files with 1038 additions and 692 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/opengl/qopenglfunctions_1_0.cpp
View File

@ -74,12 +74,14 @@ QOpenGLFunctions_1_0::QOpenGLFunctions_1_0()
QOpenGLFunctions_1_0::~QOpenGLFunctions_1_0()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_0_Deprecated)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_0_Deprecated) {
d_1_0_Deprecated->refs.deref();
Q_ASSERT(d_1_0_Deprecated->refs.load());
Q_ASSERT(d_1_0_Deprecated->refs.load());
}
}
bool QOpenGLFunctions_1_0::initializeOpenGLFunctions()

20
src/gui/opengl/qopenglfunctions_1_1.cpp
View File

@ -76,18 +76,22 @@ QOpenGLFunctions_1_1::QOpenGLFunctions_1_1()
QOpenGLFunctions_1_1::~QOpenGLFunctions_1_1()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_0_Deprecated)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_0_Deprecated) {
d_1_0_Deprecated->refs.deref();
Q_ASSERT(d_1_0_Deprecated->refs.load());
if (d_1_1_Deprecated)
Q_ASSERT(d_1_0_Deprecated->refs.load());
}
if (d_1_1_Deprecated) {
d_1_1_Deprecated->refs.deref();
Q_ASSERT(d_1_1_Deprecated->refs.load());
Q_ASSERT(d_1_1_Deprecated->refs.load());
}
}
bool QOpenGLFunctions_1_1::initializeOpenGLFunctions()

30
src/gui/opengl/qopenglfunctions_1_2.cpp
View File

@ -78,24 +78,30 @@ QOpenGLFunctions_1_2::QOpenGLFunctions_1_2()
QOpenGLFunctions_1_2::~QOpenGLFunctions_1_2()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_0_Deprecated)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_0_Deprecated) {
d_1_0_Deprecated->refs.deref();
Q_ASSERT(d_1_0_Deprecated->refs.load());
if (d_1_1_Deprecated)
Q_ASSERT(d_1_0_Deprecated->refs.load());
}
if (d_1_1_Deprecated) {
d_1_1_Deprecated->refs.deref();
Q_ASSERT(d_1_1_Deprecated->refs.load());
if (d_1_2_Deprecated)
Q_ASSERT(d_1_1_Deprecated->refs.load());
}
if (d_1_2_Deprecated) {
d_1_2_Deprecated->refs.deref();
Q_ASSERT(d_1_2_Deprecated->refs.load());
Q_ASSERT(d_1_2_Deprecated->refs.load());
}
}
bool QOpenGLFunctions_1_2::initializeOpenGLFunctions()

40
src/gui/opengl/qopenglfunctions_1_3.cpp
View File

@ -80,30 +80,38 @@ QOpenGLFunctions_1_3::QOpenGLFunctions_1_3()
QOpenGLFunctions_1_3::~QOpenGLFunctions_1_3()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_3_Core)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_3_Core) {
d_1_3_Core->refs.deref();
Q_ASSERT(d_1_3_Core->refs.load());
if (d_1_0_Deprecated)
Q_ASSERT(d_1_3_Core->refs.load());
}
if (d_1_0_Deprecated) {
d_1_0_Deprecated->refs.deref();
Q_ASSERT(d_1_0_Deprecated->refs.load());
if (d_1_1_Deprecated)
Q_ASSERT(d_1_0_Deprecated->refs.load());
}
if (d_1_1_Deprecated) {
d_1_1_Deprecated->refs.deref();
Q_ASSERT(d_1_1_Deprecated->refs.load());
if (d_1_2_Deprecated)
Q_ASSERT(d_1_1_Deprecated->refs.load());
}
if (d_1_2_Deprecated) {
d_1_2_Deprecated->refs.deref();
Q_ASSERT(d_1_2_Deprecated->refs.load());
if (d_1_3_Deprecated)
Q_ASSERT(d_1_2_Deprecated->refs.load());
}
if (d_1_3_Deprecated) {
d_1_3_Deprecated->refs.deref();
Q_ASSERT(d_1_3_Deprecated->refs.load());
Q_ASSERT(d_1_3_Deprecated->refs.load());
}
}
bool QOpenGLFunctions_1_3::initializeOpenGLFunctions()

55
src/gui/opengl/qopenglfunctions_1_5.cpp
View File

@ -83,39 +83,50 @@ QOpenGLFunctions_1_5::QOpenGLFunctions_1_5()
QOpenGLFunctions_1_5::~QOpenGLFunctions_1_5()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_3_Core)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_3_Core) {
d_1_3_Core->refs.deref();
Q_ASSERT(d_1_3_Core->refs.load());
if (d_1_4_Core)
Q_ASSERT(d_1_3_Core->refs.load());
}
if (d_1_4_Core) {
d_1_4_Core->refs.deref();
Q_ASSERT(d_1_4_Core->refs.load());
if (d_1_5_Core)
Q_ASSERT(d_1_4_Core->refs.load());
}
if (d_1_5_Core) {
d_1_5_Core->refs.deref();
Q_ASSERT(d_1_5_Core->refs.load());
if (d_1_0_Deprecated)
Q_ASSERT(d_1_5_Core->refs.load());
}
if (d_1_0_Deprecated) {
d_1_0_Deprecated->refs.deref();
Q_ASSERT(d_1_0_Deprecated->refs.load());
if (d_1_1_Deprecated)
Q_ASSERT(d_1_0_Deprecated->refs.load());
}
if (d_1_1_Deprecated) {
d_1_1_Deprecated->refs.deref();
Q_ASSERT(d_1_1_Deprecated->refs.load());
if (d_1_2_Deprecated)
Q_ASSERT(d_1_1_Deprecated->refs.load());
}
if (d_1_2_Deprecated) {
d_1_2_Deprecated->refs.deref();
Q_ASSERT(d_1_2_Deprecated->refs.load());
if (d_1_3_Deprecated)
Q_ASSERT(d_1_2_Deprecated->refs.load());
}
if (d_1_3_Deprecated) {
d_1_3_Deprecated->refs.deref();
Q_ASSERT(d_1_3_Deprecated->refs.load());
if (d_1_4_Deprecated)
Q_ASSERT(d_1_3_Deprecated->refs.load());
}
if (d_1_4_Deprecated) {
d_1_4_Deprecated->refs.deref();
Q_ASSERT(d_1_4_Deprecated->refs.load());
Q_ASSERT(d_1_4_Deprecated->refs.load());
}
}
bool QOpenGLFunctions_1_5::initializeOpenGLFunctions()

60
src/gui/opengl/qopenglfunctions_2_0.cpp
View File

@ -85,42 +85,54 @@ QOpenGLFunctions_2_0::QOpenGLFunctions_2_0()
QOpenGLFunctions_2_0::~QOpenGLFunctions_2_0()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_3_Core)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_3_Core) {
d_1_3_Core->refs.deref();
Q_ASSERT(d_1_3_Core->refs.load());
if (d_1_4_Core)
Q_ASSERT(d_1_3_Core->refs.load());
}
if (d_1_4_Core) {
d_1_4_Core->refs.deref();
Q_ASSERT(d_1_4_Core->refs.load());
if (d_1_5_Core)
Q_ASSERT(d_1_4_Core->refs.load());
}
if (d_1_5_Core) {
d_1_5_Core->refs.deref();
Q_ASSERT(d_1_5_Core->refs.load());
if (d_2_0_Core)
Q_ASSERT(d_1_5_Core->refs.load());
}
if (d_2_0_Core) {
d_2_0_Core->refs.deref();
Q_ASSERT(d_2_0_Core->refs.load());
if (d_1_0_Deprecated)
Q_ASSERT(d_2_0_Core->refs.load());
}
if (d_1_0_Deprecated) {
d_1_0_Deprecated->refs.deref();
Q_ASSERT(d_1_0_Deprecated->refs.load());
if (d_1_1_Deprecated)
Q_ASSERT(d_1_0_Deprecated->refs.load());
}
if (d_1_1_Deprecated) {
d_1_1_Deprecated->refs.deref();
Q_ASSERT(d_1_1_Deprecated->refs.load());
if (d_1_2_Deprecated)
Q_ASSERT(d_1_1_Deprecated->refs.load());
}
if (d_1_2_Deprecated) {
d_1_2_Deprecated->refs.deref();
Q_ASSERT(d_1_2_Deprecated->refs.load());
if (d_1_3_Deprecated)
Q_ASSERT(d_1_2_Deprecated->refs.load());
}
if (d_1_3_Deprecated) {
d_1_3_Deprecated->refs.deref();
Q_ASSERT(d_1_3_Deprecated->refs.load());
if (d_1_4_Deprecated)
Q_ASSERT(d_1_3_Deprecated->refs.load());
}
if (d_1_4_Deprecated) {
d_1_4_Deprecated->refs.deref();
Q_ASSERT(d_1_4_Deprecated->refs.load());
Q_ASSERT(d_1_4_Deprecated->refs.load());
}
}
bool QOpenGLFunctions_2_0::initializeOpenGLFunctions()

65
src/gui/opengl/qopenglfunctions_2_1.cpp
View File

@ -86,45 +86,58 @@ QOpenGLFunctions_2_1::QOpenGLFunctions_2_1()
QOpenGLFunctions_2_1::~QOpenGLFunctions_2_1()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_3_Core)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_3_Core) {
d_1_3_Core->refs.deref();
Q_ASSERT(d_1_3_Core->refs.load());
if (d_1_4_Core)
Q_ASSERT(d_1_3_Core->refs.load());
}
if (d_1_4_Core) {
d_1_4_Core->refs.deref();
Q_ASSERT(d_1_4_Core->refs.load());
if (d_1_5_Core)
Q_ASSERT(d_1_4_Core->refs.load());
}
if (d_1_5_Core) {
d_1_5_Core->refs.deref();
Q_ASSERT(d_1_5_Core->refs.load());
if (d_2_0_Core)
Q_ASSERT(d_1_5_Core->refs.load());
}
if (d_2_0_Core) {
d_2_0_Core->refs.deref();
Q_ASSERT(d_2_0_Core->refs.load());
if (d_2_1_Core)
Q_ASSERT(d_2_0_Core->refs.load());
}
if (d_2_1_Core) {
d_2_1_Core->refs.deref();
Q_ASSERT(d_2_1_Core->refs.load());
if (d_1_0_Deprecated)
Q_ASSERT(d_2_1_Core->refs.load());
}
if (d_1_0_Deprecated) {
d_1_0_Deprecated->refs.deref();
Q_ASSERT(d_1_0_Deprecated->refs.load());
if (d_1_1_Deprecated)
Q_ASSERT(d_1_0_Deprecated->refs.load());
}
if (d_1_1_Deprecated) {
d_1_1_Deprecated->refs.deref();
Q_ASSERT(d_1_1_Deprecated->refs.load());
if (d_1_2_Deprecated)
Q_ASSERT(d_1_1_Deprecated->refs.load());
}
if (d_1_2_Deprecated) {
d_1_2_Deprecated->refs.deref();
Q_ASSERT(d_1_2_Deprecated->refs.load());
if (d_1_3_Deprecated)
Q_ASSERT(d_1_2_Deprecated->refs.load());
}
if (d_1_3_Deprecated) {
d_1_3_Deprecated->refs.deref();
Q_ASSERT(d_1_3_Deprecated->refs.load());
if (d_1_4_Deprecated)
Q_ASSERT(d_1_3_Deprecated->refs.load());
}
if (d_1_4_Deprecated) {
d_1_4_Deprecated->refs.deref();
Q_ASSERT(d_1_4_Deprecated->refs.load());
Q_ASSERT(d_1_4_Deprecated->refs.load());
}
}
bool QOpenGLFunctions_2_1::initializeOpenGLFunctions()

50
src/gui/opengl/qopenglfunctions_3_1.cpp
View File

@ -82,36 +82,46 @@ QOpenGLFunctions_3_1::QOpenGLFunctions_3_1()
QOpenGLFunctions_3_1::~QOpenGLFunctions_3_1()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_3_Core)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_3_Core) {
d_1_3_Core->refs.deref();
Q_ASSERT(d_1_3_Core->refs.load());
if (d_1_4_Core)
Q_ASSERT(d_1_3_Core->refs.load());
}
if (d_1_4_Core) {
d_1_4_Core->refs.deref();
Q_ASSERT(d_1_4_Core->refs.load());
if (d_1_5_Core)
Q_ASSERT(d_1_4_Core->refs.load());
}
if (d_1_5_Core) {
d_1_5_Core->refs.deref();
Q_ASSERT(d_1_5_Core->refs.load());
if (d_2_0_Core)
Q_ASSERT(d_1_5_Core->refs.load());
}
if (d_2_0_Core) {
d_2_0_Core->refs.deref();
Q_ASSERT(d_2_0_Core->refs.load());
if (d_2_1_Core)
Q_ASSERT(d_2_0_Core->refs.load());
}
if (d_2_1_Core) {
d_2_1_Core->refs.deref();
Q_ASSERT(d_2_1_Core->refs.load());
if (d_3_0_Core)
Q_ASSERT(d_2_1_Core->refs.load());
}
if (d_3_0_Core) {
d_3_0_Core->refs.deref();
Q_ASSERT(d_3_0_Core->refs.load());
if (d_3_1_Core)
Q_ASSERT(d_3_0_Core->refs.load());
}
if (d_3_1_Core) {
d_3_1_Core->refs.deref();
Q_ASSERT(d_3_1_Core->refs.load());
Q_ASSERT(d_3_1_Core->refs.load());
}
}
bool QOpenGLFunctions_3_1::initializeOpenGLFunctions()

80
src/gui/opengl/qopenglfunctions_3_2_compatibility.cpp
View File

@ -90,54 +90,70 @@ QOpenGLFunctions_3_2_Compatibility::QOpenGLFunctions_3_2_Compatibility()
QOpenGLFunctions_3_2_Compatibility::~QOpenGLFunctions_3_2_Compatibility()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_3_Core)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_3_Core) {
d_1_3_Core->refs.deref();
Q_ASSERT(d_1_3_Core->refs.load());
if (d_1_4_Core)
Q_ASSERT(d_1_3_Core->refs.load());
}
if (d_1_4_Core) {
d_1_4_Core->refs.deref();
Q_ASSERT(d_1_4_Core->refs.load());
if (d_1_5_Core)
Q_ASSERT(d_1_4_Core->refs.load());
}
if (d_1_5_Core) {
d_1_5_Core->refs.deref();
Q_ASSERT(d_1_5_Core->refs.load());
if (d_2_0_Core)
Q_ASSERT(d_1_5_Core->refs.load());
}
if (d_2_0_Core) {
d_2_0_Core->refs.deref();
Q_ASSERT(d_2_0_Core->refs.load());
if (d_2_1_Core)
Q_ASSERT(d_2_0_Core->refs.load());
}
if (d_2_1_Core) {
d_2_1_Core->refs.deref();
Q_ASSERT(d_2_1_Core->refs.load());
if (d_3_0_Core)
Q_ASSERT(d_2_1_Core->refs.load());
}
if (d_3_0_Core) {
d_3_0_Core->refs.deref();
Q_ASSERT(d_3_0_Core->refs.load());
if (d_3_1_Core)
Q_ASSERT(d_3_0_Core->refs.load());
}
if (d_3_1_Core) {
d_3_1_Core->refs.deref();
Q_ASSERT(d_3_1_Core->refs.load());
if (d_3_2_Core)
Q_ASSERT(d_3_1_Core->refs.load());
}
if (d_3_2_Core) {
d_3_2_Core->refs.deref();
Q_ASSERT(d_3_2_Core->refs.load());
if (d_1_0_Deprecated)
Q_ASSERT(d_3_2_Core->refs.load());
}
if (d_1_0_Deprecated) {
d_1_0_Deprecated->refs.deref();
Q_ASSERT(d_1_0_Deprecated->refs.load());
if (d_1_1_Deprecated)
Q_ASSERT(d_1_0_Deprecated->refs.load());
}
if (d_1_1_Deprecated) {
d_1_1_Deprecated->refs.deref();
Q_ASSERT(d_1_1_Deprecated->refs.load());
if (d_1_2_Deprecated)
Q_ASSERT(d_1_1_Deprecated->refs.load());
}
if (d_1_2_Deprecated) {
d_1_2_Deprecated->refs.deref();
Q_ASSERT(d_1_2_Deprecated->refs.load());
if (d_1_3_Deprecated)
Q_ASSERT(d_1_2_Deprecated->refs.load());
}
if (d_1_3_Deprecated) {
d_1_3_Deprecated->refs.deref();
Q_ASSERT(d_1_3_Deprecated->refs.load());
if (d_1_4_Deprecated)
Q_ASSERT(d_1_3_Deprecated->refs.load());
}
if (d_1_4_Deprecated) {
d_1_4_Deprecated->refs.deref();
Q_ASSERT(d_1_4_Deprecated->refs.load());
Q_ASSERT(d_1_4_Deprecated->refs.load());
}
}
bool QOpenGLFunctions_3_2_Compatibility::initializeOpenGLFunctions()

55
src/gui/opengl/qopenglfunctions_3_2_core.cpp
View File

@ -83,39 +83,50 @@ QOpenGLFunctions_3_2_Core::QOpenGLFunctions_3_2_Core()
QOpenGLFunctions_3_2_Core::~QOpenGLFunctions_3_2_Core()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_3_Core)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_3_Core) {
d_1_3_Core->refs.deref();
Q_ASSERT(d_1_3_Core->refs.load());
if (d_1_4_Core)
Q_ASSERT(d_1_3_Core->refs.load());
}
if (d_1_4_Core) {
d_1_4_Core->refs.deref();
Q_ASSERT(d_1_4_Core->refs.load());
if (d_1_5_Core)
Q_ASSERT(d_1_4_Core->refs.load());
}
if (d_1_5_Core) {
d_1_5_Core->refs.deref();
Q_ASSERT(d_1_5_Core->refs.load());
if (d_2_0_Core)
Q_ASSERT(d_1_5_Core->refs.load());
}
if (d_2_0_Core) {
d_2_0_Core->refs.deref();
Q_ASSERT(d_2_0_Core->refs.load());
if (d_2_1_Core)
Q_ASSERT(d_2_0_Core->refs.load());
}
if (d_2_1_Core) {
d_2_1_Core->refs.deref();
Q_ASSERT(d_2_1_Core->refs.load());
if (d_3_0_Core)
Q_ASSERT(d_2_1_Core->refs.load());
}
if (d_3_0_Core) {
d_3_0_Core->refs.deref();
Q_ASSERT(d_3_0_Core->refs.load());
if (d_3_1_Core)
Q_ASSERT(d_3_0_Core->refs.load());
}
if (d_3_1_Core) {
d_3_1_Core->refs.deref();
Q_ASSERT(d_3_1_Core->refs.load());
if (d_3_2_Core)
Q_ASSERT(d_3_1_Core->refs.load());
}
if (d_3_2_Core) {
d_3_2_Core->refs.deref();
Q_ASSERT(d_3_2_Core->refs.load());
Q_ASSERT(d_3_2_Core->refs.load());
}
}
bool QOpenGLFunctions_3_2_Core::initializeOpenGLFunctions()

90
src/gui/opengl/qopenglfunctions_3_3_compatibility.cpp
View File

@ -91,60 +91,78 @@ QOpenGLFunctions_3_3_Compatibility::QOpenGLFunctions_3_3_Compatibility()
QOpenGLFunctions_3_3_Compatibility::~QOpenGLFunctions_3_3_Compatibility()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_3_Core)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_3_Core) {
d_1_3_Core->refs.deref();
Q_ASSERT(d_1_3_Core->refs.load());
if (d_1_4_Core)
Q_ASSERT(d_1_3_Core->refs.load());
}
if (d_1_4_Core) {
d_1_4_Core->refs.deref();
Q_ASSERT(d_1_4_Core->refs.load());
if (d_1_5_Core)
Q_ASSERT(d_1_4_Core->refs.load());
}
if (d_1_5_Core) {
d_1_5_Core->refs.deref();
Q_ASSERT(d_1_5_Core->refs.load());
if (d_2_0_Core)
Q_ASSERT(d_1_5_Core->refs.load());
}
if (d_2_0_Core) {
d_2_0_Core->refs.deref();
Q_ASSERT(d_2_0_Core->refs.load());
if (d_2_1_Core)
Q_ASSERT(d_2_0_Core->refs.load());
}
if (d_2_1_Core) {
d_2_1_Core->refs.deref();
Q_ASSERT(d_2_1_Core->refs.load());
if (d_3_0_Core)
Q_ASSERT(d_2_1_Core->refs.load());
}
if (d_3_0_Core) {
d_3_0_Core->refs.deref();
Q_ASSERT(d_3_0_Core->refs.load());
if (d_3_1_Core)
Q_ASSERT(d_3_0_Core->refs.load());
}
if (d_3_1_Core) {
d_3_1_Core->refs.deref();
Q_ASSERT(d_3_1_Core->refs.load());
if (d_3_2_Core)
Q_ASSERT(d_3_1_Core->refs.load());
}
if (d_3_2_Core) {
d_3_2_Core->refs.deref();
Q_ASSERT(d_3_2_Core->refs.load());
if (d_3_3_Core)
Q_ASSERT(d_3_2_Core->refs.load());
}
if (d_3_3_Core) {
d_3_3_Core->refs.deref();
Q_ASSERT(d_3_3_Core->refs.load());
if (d_1_0_Deprecated)
Q_ASSERT(d_3_3_Core->refs.load());
}
if (d_1_0_Deprecated) {
d_1_0_Deprecated->refs.deref();
Q_ASSERT(d_1_0_Deprecated->refs.load());
if (d_1_1_Deprecated)
Q_ASSERT(d_1_0_Deprecated->refs.load());
}
if (d_1_1_Deprecated) {
d_1_1_Deprecated->refs.deref();
Q_ASSERT(d_1_1_Deprecated->refs.load());
if (d_1_2_Deprecated)
Q_ASSERT(d_1_1_Deprecated->refs.load());
}
if (d_1_2_Deprecated) {
d_1_2_Deprecated->refs.deref();
Q_ASSERT(d_1_2_Deprecated->refs.load());
if (d_1_3_Deprecated)
Q_ASSERT(d_1_2_Deprecated->refs.load());
}
if (d_1_3_Deprecated) {
d_1_3_Deprecated->refs.deref();
Q_ASSERT(d_1_3_Deprecated->refs.load());
if (d_1_4_Deprecated)
Q_ASSERT(d_1_3_Deprecated->refs.load());
}
if (d_1_4_Deprecated) {
d_1_4_Deprecated->refs.deref();
Q_ASSERT(d_1_4_Deprecated->refs.load());
if (d_3_3_Deprecated)
Q_ASSERT(d_1_4_Deprecated->refs.load());
}
if (d_3_3_Deprecated) {
d_3_3_Deprecated->refs.deref();
Q_ASSERT(d_3_3_Deprecated->refs.load());
Q_ASSERT(d_3_3_Deprecated->refs.load());
}
}
bool QOpenGLFunctions_3_3_Compatibility::initializeOpenGLFunctions()

60
src/gui/opengl/qopenglfunctions_3_3_core.cpp
View File

@ -84,42 +84,54 @@ QOpenGLFunctions_3_3_Core::QOpenGLFunctions_3_3_Core()
QOpenGLFunctions_3_3_Core::~QOpenGLFunctions_3_3_Core()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_3_Core)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_3_Core) {
d_1_3_Core->refs.deref();
Q_ASSERT(d_1_3_Core->refs.load());
if (d_1_4_Core)
Q_ASSERT(d_1_3_Core->refs.load());
}
if (d_1_4_Core) {
d_1_4_Core->refs.deref();
Q_ASSERT(d_1_4_Core->refs.load());
if (d_1_5_Core)
Q_ASSERT(d_1_4_Core->refs.load());
}
if (d_1_5_Core) {
d_1_5_Core->refs.deref();
Q_ASSERT(d_1_5_Core->refs.load());
if (d_2_0_Core)
Q_ASSERT(d_1_5_Core->refs.load());
}
if (d_2_0_Core) {
d_2_0_Core->refs.deref();
Q_ASSERT(d_2_0_Core->refs.load());
if (d_2_1_Core)
Q_ASSERT(d_2_0_Core->refs.load());
}
if (d_2_1_Core) {
d_2_1_Core->refs.deref();
Q_ASSERT(d_2_1_Core->refs.load());
if (d_3_0_Core)
Q_ASSERT(d_2_1_Core->refs.load());
}
if (d_3_0_Core) {
d_3_0_Core->refs.deref();
Q_ASSERT(d_3_0_Core->refs.load());
if (d_3_1_Core)
Q_ASSERT(d_3_0_Core->refs.load());
}
if (d_3_1_Core) {
d_3_1_Core->refs.deref();
Q_ASSERT(d_3_1_Core->refs.load());
if (d_3_2_Core)
Q_ASSERT(d_3_1_Core->refs.load());
}
if (d_3_2_Core) {
d_3_2_Core->refs.deref();
Q_ASSERT(d_3_2_Core->refs.load());
if (d_3_3_Core)
Q_ASSERT(d_3_2_Core->refs.load());
}
if (d_3_3_Core) {
d_3_3_Core->refs.deref();
Q_ASSERT(d_3_3_Core->refs.load());
Q_ASSERT(d_3_3_Core->refs.load());
}
}
bool QOpenGLFunctions_3_3_Core::initializeOpenGLFunctions()

95
src/gui/opengl/qopenglfunctions_4_0_compatibility.cpp
View File

@ -92,63 +92,82 @@ QOpenGLFunctions_4_0_Compatibility::QOpenGLFunctions_4_0_Compatibility()
QOpenGLFunctions_4_0_Compatibility::~QOpenGLFunctions_4_0_Compatibility()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_3_Core)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_3_Core) {
d_1_3_Core->refs.deref();
Q_ASSERT(d_1_3_Core->refs.load());
if (d_1_4_Core)
Q_ASSERT(d_1_3_Core->refs.load());
}
if (d_1_4_Core) {
d_1_4_Core->refs.deref();
Q_ASSERT(d_1_4_Core->refs.load());
if (d_1_5_Core)
Q_ASSERT(d_1_4_Core->refs.load());
}
if (d_1_5_Core) {
d_1_5_Core->refs.deref();
Q_ASSERT(d_1_5_Core->refs.load());
if (d_2_0_Core)
Q_ASSERT(d_1_5_Core->refs.load());
}
if (d_2_0_Core) {
d_2_0_Core->refs.deref();
Q_ASSERT(d_2_0_Core->refs.load());
if (d_2_1_Core)
Q_ASSERT(d_2_0_Core->refs.load());
}
if (d_2_1_Core) {
d_2_1_Core->refs.deref();
Q_ASSERT(d_2_1_Core->refs.load());
if (d_3_0_Core)
Q_ASSERT(d_2_1_Core->refs.load());
}
if (d_3_0_Core) {
d_3_0_Core->refs.deref();
Q_ASSERT(d_3_0_Core->refs.load());
if (d_3_1_Core)
Q_ASSERT(d_3_0_Core->refs.load());
}
if (d_3_1_Core) {
d_3_1_Core->refs.deref();
Q_ASSERT(d_3_1_Core->refs.load());
if (d_3_2_Core)
Q_ASSERT(d_3_1_Core->refs.load());
}
if (d_3_2_Core) {
d_3_2_Core->refs.deref();
Q_ASSERT(d_3_2_Core->refs.load());
if (d_3_3_Core)
Q_ASSERT(d_3_2_Core->refs.load());
}
if (d_3_3_Core) {
d_3_3_Core->refs.deref();
Q_ASSERT(d_3_3_Core->refs.load());
if (d_4_0_Core)
Q_ASSERT(d_3_3_Core->refs.load());
}
if (d_4_0_Core) {
d_4_0_Core->refs.deref();
Q_ASSERT(d_4_0_Core->refs.load());
if (d_1_0_Deprecated)
Q_ASSERT(d_4_0_Core->refs.load());
}
if (d_1_0_Deprecated) {
d_1_0_Deprecated->refs.deref();
Q_ASSERT(d_1_0_Deprecated->refs.load());
if (d_1_1_Deprecated)
Q_ASSERT(d_1_0_Deprecated->refs.load());
}
if (d_1_1_Deprecated) {
d_1_1_Deprecated->refs.deref();
Q_ASSERT(d_1_1_Deprecated->refs.load());
if (d_1_2_Deprecated)
Q_ASSERT(d_1_1_Deprecated->refs.load());
}
if (d_1_2_Deprecated) {
d_1_2_Deprecated->refs.deref();
Q_ASSERT(d_1_2_Deprecated->refs.load());
if (d_1_3_Deprecated)
Q_ASSERT(d_1_2_Deprecated->refs.load());
}
if (d_1_3_Deprecated) {
d_1_3_Deprecated->refs.deref();
Q_ASSERT(d_1_3_Deprecated->refs.load());
if (d_1_4_Deprecated)
Q_ASSERT(d_1_3_Deprecated->refs.load());
}
if (d_1_4_Deprecated) {
d_1_4_Deprecated->refs.deref();
Q_ASSERT(d_1_4_Deprecated->refs.load());
if (d_3_3_Deprecated)
Q_ASSERT(d_1_4_Deprecated->refs.load());
}
if (d_3_3_Deprecated) {
d_3_3_Deprecated->refs.deref();
Q_ASSERT(d_3_3_Deprecated->refs.load());
Q_ASSERT(d_3_3_Deprecated->refs.load());
}
}
bool QOpenGLFunctions_4_0_Compatibility::initializeOpenGLFunctions()

65
src/gui/opengl/qopenglfunctions_4_0_core.cpp
View File

@ -85,45 +85,58 @@ QOpenGLFunctions_4_0_Core::QOpenGLFunctions_4_0_Core()
QOpenGLFunctions_4_0_Core::~QOpenGLFunctions_4_0_Core()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_3_Core)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_3_Core) {
d_1_3_Core->refs.deref();
Q_ASSERT(d_1_3_Core->refs.load());
if (d_1_4_Core)
Q_ASSERT(d_1_3_Core->refs.load());
}
if (d_1_4_Core) {
d_1_4_Core->refs.deref();
Q_ASSERT(d_1_4_Core->refs.load());
if (d_1_5_Core)
Q_ASSERT(d_1_4_Core->refs.load());
}
if (d_1_5_Core) {
d_1_5_Core->refs.deref();
Q_ASSERT(d_1_5_Core->refs.load());
if (d_2_0_Core)
Q_ASSERT(d_1_5_Core->refs.load());
}
if (d_2_0_Core) {
d_2_0_Core->refs.deref();
Q_ASSERT(d_2_0_Core->refs.load());
if (d_2_1_Core)
Q_ASSERT(d_2_0_Core->refs.load());
}
if (d_2_1_Core) {
d_2_1_Core->refs.deref();
Q_ASSERT(d_2_1_Core->refs.load());
if (d_3_0_Core)
Q_ASSERT(d_2_1_Core->refs.load());
}
if (d_3_0_Core) {
d_3_0_Core->refs.deref();
Q_ASSERT(d_3_0_Core->refs.load());
if (d_3_1_Core)
Q_ASSERT(d_3_0_Core->refs.load());
}
if (d_3_1_Core) {
d_3_1_Core->refs.deref();
Q_ASSERT(d_3_1_Core->refs.load());
if (d_3_2_Core)
Q_ASSERT(d_3_1_Core->refs.load());
}
if (d_3_2_Core) {
d_3_2_Core->refs.deref();
Q_ASSERT(d_3_2_Core->refs.load());
if (d_3_3_Core)
Q_ASSERT(d_3_2_Core->refs.load());
}
if (d_3_3_Core) {
d_3_3_Core->refs.deref();
Q_ASSERT(d_3_3_Core->refs.load());
if (d_4_0_Core)
Q_ASSERT(d_3_3_Core->refs.load());
}
if (d_4_0_Core) {
d_4_0_Core->refs.deref();
Q_ASSERT(d_4_0_Core->refs.load());
Q_ASSERT(d_4_0_Core->refs.load());
}
}
bool QOpenGLFunctions_4_0_Core::initializeOpenGLFunctions()

100
src/gui/opengl/qopenglfunctions_4_1_compatibility.cpp
View File

@ -93,66 +93,86 @@ QOpenGLFunctions_4_1_Compatibility::QOpenGLFunctions_4_1_Compatibility()
QOpenGLFunctions_4_1_Compatibility::~QOpenGLFunctions_4_1_Compatibility()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_3_Core)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_3_Core) {
d_1_3_Core->refs.deref();
Q_ASSERT(d_1_3_Core->refs.load());
if (d_1_4_Core)
Q_ASSERT(d_1_3_Core->refs.load());
}
if (d_1_4_Core) {
d_1_4_Core->refs.deref();
Q_ASSERT(d_1_4_Core->refs.load());
if (d_1_5_Core)
Q_ASSERT(d_1_4_Core->refs.load());
}
if (d_1_5_Core) {
d_1_5_Core->refs.deref();
Q_ASSERT(d_1_5_Core->refs.load());
if (d_2_0_Core)
Q_ASSERT(d_1_5_Core->refs.load());
}
if (d_2_0_Core) {
d_2_0_Core->refs.deref();
Q_ASSERT(d_2_0_Core->refs.load());
if (d_2_1_Core)
Q_ASSERT(d_2_0_Core->refs.load());
}
if (d_2_1_Core) {
d_2_1_Core->refs.deref();
Q_ASSERT(d_2_1_Core->refs.load());
if (d_3_0_Core)
Q_ASSERT(d_2_1_Core->refs.load());
}
if (d_3_0_Core) {
d_3_0_Core->refs.deref();
Q_ASSERT(d_3_0_Core->refs.load());
if (d_3_1_Core)
Q_ASSERT(d_3_0_Core->refs.load());
}
if (d_3_1_Core) {
d_3_1_Core->refs.deref();
Q_ASSERT(d_3_1_Core->refs.load());
if (d_3_2_Core)
Q_ASSERT(d_3_1_Core->refs.load());
}
if (d_3_2_Core) {
d_3_2_Core->refs.deref();
Q_ASSERT(d_3_2_Core->refs.load());
if (d_3_3_Core)
Q_ASSERT(d_3_2_Core->refs.load());
}
if (d_3_3_Core) {
d_3_3_Core->refs.deref();
Q_ASSERT(d_3_3_Core->refs.load());
if (d_4_0_Core)
Q_ASSERT(d_3_3_Core->refs.load());
}
if (d_4_0_Core) {
d_4_0_Core->refs.deref();
Q_ASSERT(d_4_0_Core->refs.load());
if (d_4_1_Core)
Q_ASSERT(d_4_0_Core->refs.load());
}
if (d_4_1_Core) {
d_4_1_Core->refs.deref();
Q_ASSERT(d_4_1_Core->refs.load());
if (d_1_0_Deprecated)
Q_ASSERT(d_4_1_Core->refs.load());
}
if (d_1_0_Deprecated) {
d_1_0_Deprecated->refs.deref();
Q_ASSERT(d_1_0_Deprecated->refs.load());
if (d_1_1_Deprecated)
Q_ASSERT(d_1_0_Deprecated->refs.load());
}
if (d_1_1_Deprecated) {
d_1_1_Deprecated->refs.deref();
Q_ASSERT(d_1_1_Deprecated->refs.load());
if (d_1_2_Deprecated)
Q_ASSERT(d_1_1_Deprecated->refs.load());
}
if (d_1_2_Deprecated) {
d_1_2_Deprecated->refs.deref();
Q_ASSERT(d_1_2_Deprecated->refs.load());
if (d_1_3_Deprecated)
Q_ASSERT(d_1_2_Deprecated->refs.load());
}
if (d_1_3_Deprecated) {
d_1_3_Deprecated->refs.deref();
Q_ASSERT(d_1_3_Deprecated->refs.load());
if (d_1_4_Deprecated)
Q_ASSERT(d_1_3_Deprecated->refs.load());
}
if (d_1_4_Deprecated) {
d_1_4_Deprecated->refs.deref();
Q_ASSERT(d_1_4_Deprecated->refs.load());
if (d_3_3_Deprecated)
Q_ASSERT(d_1_4_Deprecated->refs.load());
}
if (d_3_3_Deprecated) {
d_3_3_Deprecated->refs.deref();
Q_ASSERT(d_3_3_Deprecated->refs.load());
Q_ASSERT(d_3_3_Deprecated->refs.load());
}
}
bool QOpenGLFunctions_4_1_Compatibility::initializeOpenGLFunctions()

70
src/gui/opengl/qopenglfunctions_4_1_core.cpp
View File

@ -86,48 +86,62 @@ QOpenGLFunctions_4_1_Core::QOpenGLFunctions_4_1_Core()
QOpenGLFunctions_4_1_Core::~QOpenGLFunctions_4_1_Core()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_3_Core)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_3_Core) {
d_1_3_Core->refs.deref();
Q_ASSERT(d_1_3_Core->refs.load());
if (d_1_4_Core)
Q_ASSERT(d_1_3_Core->refs.load());
}
if (d_1_4_Core) {
d_1_4_Core->refs.deref();
Q_ASSERT(d_1_4_Core->refs.load());
if (d_1_5_Core)
Q_ASSERT(d_1_4_Core->refs.load());
}
if (d_1_5_Core) {
d_1_5_Core->refs.deref();
Q_ASSERT(d_1_5_Core->refs.load());
if (d_2_0_Core)
Q_ASSERT(d_1_5_Core->refs.load());
}
if (d_2_0_Core) {
d_2_0_Core->refs.deref();
Q_ASSERT(d_2_0_Core->refs.load());
if (d_2_1_Core)
Q_ASSERT(d_2_0_Core->refs.load());
}
if (d_2_1_Core) {
d_2_1_Core->refs.deref();
Q_ASSERT(d_2_1_Core->refs.load());
if (d_3_0_Core)
Q_ASSERT(d_2_1_Core->refs.load());
}
if (d_3_0_Core) {
d_3_0_Core->refs.deref();
Q_ASSERT(d_3_0_Core->refs.load());
if (d_3_1_Core)
Q_ASSERT(d_3_0_Core->refs.load());
}
if (d_3_1_Core) {
d_3_1_Core->refs.deref();
Q_ASSERT(d_3_1_Core->refs.load());
if (d_3_2_Core)
Q_ASSERT(d_3_1_Core->refs.load());
}
if (d_3_2_Core) {
d_3_2_Core->refs.deref();
Q_ASSERT(d_3_2_Core->refs.load());
if (d_3_3_Core)
Q_ASSERT(d_3_2_Core->refs.load());
}
if (d_3_3_Core) {
d_3_3_Core->refs.deref();
Q_ASSERT(d_3_3_Core->refs.load());
if (d_4_0_Core)
Q_ASSERT(d_3_3_Core->refs.load());
}
if (d_4_0_Core) {
d_4_0_Core->refs.deref();
Q_ASSERT(d_4_0_Core->refs.load());
if (d_4_1_Core)
Q_ASSERT(d_4_0_Core->refs.load());
}
if (d_4_1_Core) {
d_4_1_Core->refs.deref();
Q_ASSERT(d_4_1_Core->refs.load());
Q_ASSERT(d_4_1_Core->refs.load());
}
}
bool QOpenGLFunctions_4_1_Core::initializeOpenGLFunctions()

105
src/gui/opengl/qopenglfunctions_4_2_compatibility.cpp
View File

@ -94,69 +94,90 @@ QOpenGLFunctions_4_2_Compatibility::QOpenGLFunctions_4_2_Compatibility()
QOpenGLFunctions_4_2_Compatibility::~QOpenGLFunctions_4_2_Compatibility()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_3_Core)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_3_Core) {
d_1_3_Core->refs.deref();
Q_ASSERT(d_1_3_Core->refs.load());
if (d_1_4_Core)
Q_ASSERT(d_1_3_Core->refs.load());
}
if (d_1_4_Core) {
d_1_4_Core->refs.deref();
Q_ASSERT(d_1_4_Core->refs.load());
if (d_1_5_Core)
Q_ASSERT(d_1_4_Core->refs.load());
}
if (d_1_5_Core) {
d_1_5_Core->refs.deref();
Q_ASSERT(d_1_5_Core->refs.load());
if (d_2_0_Core)
Q_ASSERT(d_1_5_Core->refs.load());
}
if (d_2_0_Core) {
d_2_0_Core->refs.deref();
Q_ASSERT(d_2_0_Core->refs.load());
if (d_2_1_Core)
Q_ASSERT(d_2_0_Core->refs.load());
}
if (d_2_1_Core) {
d_2_1_Core->refs.deref();
Q_ASSERT(d_2_1_Core->refs.load());
if (d_3_0_Core)
Q_ASSERT(d_2_1_Core->refs.load());
}
if (d_3_0_Core) {
d_3_0_Core->refs.deref();
Q_ASSERT(d_3_0_Core->refs.load());
if (d_3_1_Core)
Q_ASSERT(d_3_0_Core->refs.load());
}
if (d_3_1_Core) {
d_3_1_Core->refs.deref();
Q_ASSERT(d_3_1_Core->refs.load());
if (d_3_2_Core)
Q_ASSERT(d_3_1_Core->refs.load());
}
if (d_3_2_Core) {
d_3_2_Core->refs.deref();
Q_ASSERT(d_3_2_Core->refs.load());
if (d_3_3_Core)
Q_ASSERT(d_3_2_Core->refs.load());
}
if (d_3_3_Core) {
d_3_3_Core->refs.deref();
Q_ASSERT(d_3_3_Core->refs.load());
if (d_4_0_Core)
Q_ASSERT(d_3_3_Core->refs.load());
}
if (d_4_0_Core) {
d_4_0_Core->refs.deref();
Q_ASSERT(d_4_0_Core->refs.load());
if (d_4_1_Core)
Q_ASSERT(d_4_0_Core->refs.load());
}
if (d_4_1_Core) {
d_4_1_Core->refs.deref();
Q_ASSERT(d_4_1_Core->refs.load());
if (d_4_2_Core)
Q_ASSERT(d_4_1_Core->refs.load());
}
if (d_4_2_Core) {
d_4_2_Core->refs.deref();
Q_ASSERT(d_4_2_Core->refs.load());
if (d_1_0_Deprecated)
Q_ASSERT(d_4_2_Core->refs.load());
}
if (d_1_0_Deprecated) {
d_1_0_Deprecated->refs.deref();
Q_ASSERT(d_1_0_Deprecated->refs.load());
if (d_1_1_Deprecated)
Q_ASSERT(d_1_0_Deprecated->refs.load());
}
if (d_1_1_Deprecated) {
d_1_1_Deprecated->refs.deref();
Q_ASSERT(d_1_1_Deprecated->refs.load());
if (d_1_2_Deprecated)
Q_ASSERT(d_1_1_Deprecated->refs.load());
}
if (d_1_2_Deprecated) {
d_1_2_Deprecated->refs.deref();
Q_ASSERT(d_1_2_Deprecated->refs.load());
if (d_1_3_Deprecated)
Q_ASSERT(d_1_2_Deprecated->refs.load());
}
if (d_1_3_Deprecated) {
d_1_3_Deprecated->refs.deref();
Q_ASSERT(d_1_3_Deprecated->refs.load());
if (d_1_4_Deprecated)
Q_ASSERT(d_1_3_Deprecated->refs.load());
}
if (d_1_4_Deprecated) {
d_1_4_Deprecated->refs.deref();
Q_ASSERT(d_1_4_Deprecated->refs.load());
if (d_3_3_Deprecated)
Q_ASSERT(d_1_4_Deprecated->refs.load());
}
if (d_3_3_Deprecated) {
d_3_3_Deprecated->refs.deref();
Q_ASSERT(d_3_3_Deprecated->refs.load());
Q_ASSERT(d_3_3_Deprecated->refs.load());
}
}
bool QOpenGLFunctions_4_2_Compatibility::initializeOpenGLFunctions()

75
src/gui/opengl/qopenglfunctions_4_2_core.cpp
View File

@ -87,51 +87,66 @@ QOpenGLFunctions_4_2_Core::QOpenGLFunctions_4_2_Core()
QOpenGLFunctions_4_2_Core::~QOpenGLFunctions_4_2_Core()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_3_Core)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_3_Core) {
d_1_3_Core->refs.deref();
Q_ASSERT(d_1_3_Core->refs.load());
if (d_1_4_Core)
Q_ASSERT(d_1_3_Core->refs.load());
}
if (d_1_4_Core) {
d_1_4_Core->refs.deref();
Q_ASSERT(d_1_4_Core->refs.load());
if (d_1_5_Core)
Q_ASSERT(d_1_4_Core->refs.load());
}
if (d_1_5_Core) {
d_1_5_Core->refs.deref();
Q_ASSERT(d_1_5_Core->refs.load());
if (d_2_0_Core)
Q_ASSERT(d_1_5_Core->refs.load());
}
if (d_2_0_Core) {
d_2_0_Core->refs.deref();
Q_ASSERT(d_2_0_Core->refs.load());
if (d_2_1_Core)
Q_ASSERT(d_2_0_Core->refs.load());
}
if (d_2_1_Core) {
d_2_1_Core->refs.deref();
Q_ASSERT(d_2_1_Core->refs.load());
if (d_3_0_Core)
Q_ASSERT(d_2_1_Core->refs.load());
}
if (d_3_0_Core) {
d_3_0_Core->refs.deref();
Q_ASSERT(d_3_0_Core->refs.load());
if (d_3_1_Core)
Q_ASSERT(d_3_0_Core->refs.load());
}
if (d_3_1_Core) {
d_3_1_Core->refs.deref();
Q_ASSERT(d_3_1_Core->refs.load());
if (d_3_2_Core)
Q_ASSERT(d_3_1_Core->refs.load());
}
if (d_3_2_Core) {
d_3_2_Core->refs.deref();
Q_ASSERT(d_3_2_Core->refs.load());
if (d_3_3_Core)
Q_ASSERT(d_3_2_Core->refs.load());
}
if (d_3_3_Core) {
d_3_3_Core->refs.deref();
Q_ASSERT(d_3_3_Core->refs.load());
if (d_4_0_Core)
Q_ASSERT(d_3_3_Core->refs.load());
}
if (d_4_0_Core) {
d_4_0_Core->refs.deref();
Q_ASSERT(d_4_0_Core->refs.load());
if (d_4_1_Core)
Q_ASSERT(d_4_0_Core->refs.load());
}
if (d_4_1_Core) {
d_4_1_Core->refs.deref();
Q_ASSERT(d_4_1_Core->refs.load());
if (d_4_2_Core)
Q_ASSERT(d_4_1_Core->refs.load());
}
if (d_4_2_Core) {
d_4_2_Core->refs.deref();
Q_ASSERT(d_4_2_Core->refs.load());
Q_ASSERT(d_4_2_Core->refs.load());
}
}
bool QOpenGLFunctions_4_2_Core::initializeOpenGLFunctions()

110
src/gui/opengl/qopenglfunctions_4_3_compatibility.cpp
View File

@ -95,72 +95,94 @@ QOpenGLFunctions_4_3_Compatibility::QOpenGLFunctions_4_3_Compatibility()
QOpenGLFunctions_4_3_Compatibility::~QOpenGLFunctions_4_3_Compatibility()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_3_Core)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_3_Core) {
d_1_3_Core->refs.deref();
Q_ASSERT(d_1_3_Core->refs.load());
if (d_1_4_Core)
Q_ASSERT(d_1_3_Core->refs.load());
}
if (d_1_4_Core) {
d_1_4_Core->refs.deref();
Q_ASSERT(d_1_4_Core->refs.load());
if (d_1_5_Core)
Q_ASSERT(d_1_4_Core->refs.load());
}
if (d_1_5_Core) {
d_1_5_Core->refs.deref();
Q_ASSERT(d_1_5_Core->refs.load());
if (d_2_0_Core)
Q_ASSERT(d_1_5_Core->refs.load());
}
if (d_2_0_Core) {
d_2_0_Core->refs.deref();
Q_ASSERT(d_2_0_Core->refs.load());
if (d_2_1_Core)
Q_ASSERT(d_2_0_Core->refs.load());
}
if (d_2_1_Core) {
d_2_1_Core->refs.deref();
Q_ASSERT(d_2_1_Core->refs.load());
if (d_3_0_Core)
Q_ASSERT(d_2_1_Core->refs.load());
}
if (d_3_0_Core) {
d_3_0_Core->refs.deref();
Q_ASSERT(d_3_0_Core->refs.load());
if (d_3_1_Core)
Q_ASSERT(d_3_0_Core->refs.load());
}
if (d_3_1_Core) {
d_3_1_Core->refs.deref();
Q_ASSERT(d_3_1_Core->refs.load());
if (d_3_2_Core)
Q_ASSERT(d_3_1_Core->refs.load());
}
if (d_3_2_Core) {
d_3_2_Core->refs.deref();
Q_ASSERT(d_3_2_Core->refs.load());
if (d_3_3_Core)
Q_ASSERT(d_3_2_Core->refs.load());
}
if (d_3_3_Core) {
d_3_3_Core->refs.deref();
Q_ASSERT(d_3_3_Core->refs.load());
if (d_4_0_Core)
Q_ASSERT(d_3_3_Core->refs.load());
}
if (d_4_0_Core) {
d_4_0_Core->refs.deref();
Q_ASSERT(d_4_0_Core->refs.load());
if (d_4_1_Core)
Q_ASSERT(d_4_0_Core->refs.load());
}
if (d_4_1_Core) {
d_4_1_Core->refs.deref();
Q_ASSERT(d_4_1_Core->refs.load());
if (d_4_2_Core)
Q_ASSERT(d_4_1_Core->refs.load());
}
if (d_4_2_Core) {
d_4_2_Core->refs.deref();
Q_ASSERT(d_4_2_Core->refs.load());
if (d_4_3_Core)
Q_ASSERT(d_4_2_Core->refs.load());
}
if (d_4_3_Core) {
d_4_3_Core->refs.deref();
Q_ASSERT(d_4_3_Core->refs.load());
if (d_1_0_Deprecated)
Q_ASSERT(d_4_3_Core->refs.load());
}
if (d_1_0_Deprecated) {
d_1_0_Deprecated->refs.deref();
Q_ASSERT(d_1_0_Deprecated->refs.load());
if (d_1_1_Deprecated)
Q_ASSERT(d_1_0_Deprecated->refs.load());
}
if (d_1_1_Deprecated) {
d_1_1_Deprecated->refs.deref();
Q_ASSERT(d_1_1_Deprecated->refs.load());
if (d_1_2_Deprecated)
Q_ASSERT(d_1_1_Deprecated->refs.load());
}
if (d_1_2_Deprecated) {
d_1_2_Deprecated->refs.deref();
Q_ASSERT(d_1_2_Deprecated->refs.load());
if (d_1_3_Deprecated)
Q_ASSERT(d_1_2_Deprecated->refs.load());
}
if (d_1_3_Deprecated) {
d_1_3_Deprecated->refs.deref();
Q_ASSERT(d_1_3_Deprecated->refs.load());
if (d_1_4_Deprecated)
Q_ASSERT(d_1_3_Deprecated->refs.load());
}
if (d_1_4_Deprecated) {
d_1_4_Deprecated->refs.deref();
Q_ASSERT(d_1_4_Deprecated->refs.load());
if (d_3_3_Deprecated)
Q_ASSERT(d_1_4_Deprecated->refs.load());
}
if (d_3_3_Deprecated) {
d_3_3_Deprecated->refs.deref();
Q_ASSERT(d_3_3_Deprecated->refs.load());
Q_ASSERT(d_3_3_Deprecated->refs.load());
}
}
bool QOpenGLFunctions_4_3_Compatibility::initializeOpenGLFunctions()

80
src/gui/opengl/qopenglfunctions_4_3_core.cpp
View File

@ -88,54 +88,70 @@ QOpenGLFunctions_4_3_Core::QOpenGLFunctions_4_3_Core()
QOpenGLFunctions_4_3_Core::~QOpenGLFunctions_4_3_Core()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_3_Core)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_3_Core) {
d_1_3_Core->refs.deref();
Q_ASSERT(d_1_3_Core->refs.load());
if (d_1_4_Core)
Q_ASSERT(d_1_3_Core->refs.load());
}
if (d_1_4_Core) {
d_1_4_Core->refs.deref();
Q_ASSERT(d_1_4_Core->refs.load());
if (d_1_5_Core)
Q_ASSERT(d_1_4_Core->refs.load());
}
if (d_1_5_Core) {
d_1_5_Core->refs.deref();
Q_ASSERT(d_1_5_Core->refs.load());
if (d_2_0_Core)
Q_ASSERT(d_1_5_Core->refs.load());
}
if (d_2_0_Core) {
d_2_0_Core->refs.deref();
Q_ASSERT(d_2_0_Core->refs.load());
if (d_2_1_Core)
Q_ASSERT(d_2_0_Core->refs.load());
}
if (d_2_1_Core) {
d_2_1_Core->refs.deref();
Q_ASSERT(d_2_1_Core->refs.load());
if (d_3_0_Core)
Q_ASSERT(d_2_1_Core->refs.load());
}
if (d_3_0_Core) {
d_3_0_Core->refs.deref();
Q_ASSERT(d_3_0_Core->refs.load());
if (d_3_1_Core)
Q_ASSERT(d_3_0_Core->refs.load());
}
if (d_3_1_Core) {
d_3_1_Core->refs.deref();
Q_ASSERT(d_3_1_Core->refs.load());
if (d_3_2_Core)
Q_ASSERT(d_3_1_Core->refs.load());
}
if (d_3_2_Core) {
d_3_2_Core->refs.deref();
Q_ASSERT(d_3_2_Core->refs.load());
if (d_3_3_Core)
Q_ASSERT(d_3_2_Core->refs.load());
}
if (d_3_3_Core) {
d_3_3_Core->refs.deref();
Q_ASSERT(d_3_3_Core->refs.load());
if (d_4_0_Core)
Q_ASSERT(d_3_3_Core->refs.load());
}
if (d_4_0_Core) {
d_4_0_Core->refs.deref();
Q_ASSERT(d_4_0_Core->refs.load());
if (d_4_1_Core)
Q_ASSERT(d_4_0_Core->refs.load());
}
if (d_4_1_Core) {
d_4_1_Core->refs.deref();
Q_ASSERT(d_4_1_Core->refs.load());
if (d_4_2_Core)
Q_ASSERT(d_4_1_Core->refs.load());
}
if (d_4_2_Core) {
d_4_2_Core->refs.deref();
Q_ASSERT(d_4_2_Core->refs.load());
if (d_4_3_Core)
Q_ASSERT(d_4_2_Core->refs.load());
}
if (d_4_3_Core) {
d_4_3_Core->refs.deref();
Q_ASSERT(d_4_3_Core->refs.load());
Q_ASSERT(d_4_3_Core->refs.load());
}
}
bool QOpenGLFunctions_4_3_Core::initializeOpenGLFunctions()

115
src/gui/opengl/qopenglfunctions_4_4_compatibility.cpp
View File

@ -95,75 +95,98 @@ QOpenGLFunctions_4_4_Compatibility::QOpenGLFunctions_4_4_Compatibility()
QOpenGLFunctions_4_4_Compatibility::~QOpenGLFunctions_4_4_Compatibility()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_3_Core)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_3_Core) {
d_1_3_Core->refs.deref();
Q_ASSERT(d_1_3_Core->refs.load());
if (d_1_4_Core)
Q_ASSERT(d_1_3_Core->refs.load());
}
if (d_1_4_Core) {
d_1_4_Core->refs.deref();
Q_ASSERT(d_1_4_Core->refs.load());
if (d_1_5_Core)
Q_ASSERT(d_1_4_Core->refs.load());
}
if (d_1_5_Core) {
d_1_5_Core->refs.deref();
Q_ASSERT(d_1_5_Core->refs.load());
if (d_2_0_Core)
Q_ASSERT(d_1_5_Core->refs.load());
}
if (d_2_0_Core) {
d_2_0_Core->refs.deref();
Q_ASSERT(d_2_0_Core->refs.load());
if (d_2_1_Core)
Q_ASSERT(d_2_0_Core->refs.load());
}
if (d_2_1_Core) {
d_2_1_Core->refs.deref();
Q_ASSERT(d_2_1_Core->refs.load());
if (d_3_0_Core)
Q_ASSERT(d_2_1_Core->refs.load());
}
if (d_3_0_Core) {
d_3_0_Core->refs.deref();
Q_ASSERT(d_3_0_Core->refs.load());
if (d_3_1_Core)
Q_ASSERT(d_3_0_Core->refs.load());
}
if (d_3_1_Core) {
d_3_1_Core->refs.deref();
Q_ASSERT(d_3_1_Core->refs.load());
if (d_3_2_Core)
Q_ASSERT(d_3_1_Core->refs.load());
}
if (d_3_2_Core) {
d_3_2_Core->refs.deref();
Q_ASSERT(d_3_2_Core->refs.load());
if (d_3_3_Core)
Q_ASSERT(d_3_2_Core->refs.load());
}
if (d_3_3_Core) {
d_3_3_Core->refs.deref();
Q_ASSERT(d_3_3_Core->refs.load());
if (d_4_0_Core)
Q_ASSERT(d_3_3_Core->refs.load());
}
if (d_4_0_Core) {
d_4_0_Core->refs.deref();
Q_ASSERT(d_4_0_Core->refs.load());
if (d_4_1_Core)
Q_ASSERT(d_4_0_Core->refs.load());
}
if (d_4_1_Core) {
d_4_1_Core->refs.deref();
Q_ASSERT(d_4_1_Core->refs.load());
if (d_4_2_Core)
Q_ASSERT(d_4_1_Core->refs.load());
}
if (d_4_2_Core) {
d_4_2_Core->refs.deref();
Q_ASSERT(d_4_2_Core->refs.load());
if (d_4_3_Core)
Q_ASSERT(d_4_2_Core->refs.load());
}
if (d_4_3_Core) {
d_4_3_Core->refs.deref();
Q_ASSERT(d_4_3_Core->refs.load());
if (d_4_4_Core)
Q_ASSERT(d_4_3_Core->refs.load());
}
if (d_4_4_Core) {
d_4_4_Core->refs.deref();
Q_ASSERT(d_4_4_Core->refs.load());
if (d_1_0_Deprecated)
Q_ASSERT(d_4_4_Core->refs.load());
}
if (d_1_0_Deprecated) {
d_1_0_Deprecated->refs.deref();
Q_ASSERT(d_1_0_Deprecated->refs.load());
if (d_1_1_Deprecated)
Q_ASSERT(d_1_0_Deprecated->refs.load());
}
if (d_1_1_Deprecated) {
d_1_1_Deprecated->refs.deref();
Q_ASSERT(d_1_1_Deprecated->refs.load());
if (d_1_2_Deprecated)
Q_ASSERT(d_1_1_Deprecated->refs.load());
}
if (d_1_2_Deprecated) {
d_1_2_Deprecated->refs.deref();
Q_ASSERT(d_1_2_Deprecated->refs.load());
if (d_1_3_Deprecated)
Q_ASSERT(d_1_2_Deprecated->refs.load());
}
if (d_1_3_Deprecated) {
d_1_3_Deprecated->refs.deref();
Q_ASSERT(d_1_3_Deprecated->refs.load());
if (d_1_4_Deprecated)
Q_ASSERT(d_1_3_Deprecated->refs.load());
}
if (d_1_4_Deprecated) {
d_1_4_Deprecated->refs.deref();
Q_ASSERT(d_1_4_Deprecated->refs.load());
if (d_3_3_Deprecated)
Q_ASSERT(d_1_4_Deprecated->refs.load());
}
if (d_3_3_Deprecated) {
d_3_3_Deprecated->refs.deref();
Q_ASSERT(d_3_3_Deprecated->refs.load());
Q_ASSERT(d_3_3_Deprecated->refs.load());
}
}
bool QOpenGLFunctions_4_4_Compatibility::initializeOpenGLFunctions()

85
src/gui/opengl/qopenglfunctions_4_4_core.cpp
View File

@ -89,57 +89,74 @@ QOpenGLFunctions_4_4_Core::QOpenGLFunctions_4_4_Core()
QOpenGLFunctions_4_4_Core::~QOpenGLFunctions_4_4_Core()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_3_Core)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_3_Core) {
d_1_3_Core->refs.deref();
Q_ASSERT(d_1_3_Core->refs.load());
if (d_1_4_Core)
Q_ASSERT(d_1_3_Core->refs.load());
}
if (d_1_4_Core) {
d_1_4_Core->refs.deref();
Q_ASSERT(d_1_4_Core->refs.load());
if (d_1_5_Core)
Q_ASSERT(d_1_4_Core->refs.load());
}
if (d_1_5_Core) {
d_1_5_Core->refs.deref();
Q_ASSERT(d_1_5_Core->refs.load());
if (d_2_0_Core)
Q_ASSERT(d_1_5_Core->refs.load());
}
if (d_2_0_Core) {
d_2_0_Core->refs.deref();
Q_ASSERT(d_2_0_Core->refs.load());
if (d_2_1_Core)
Q_ASSERT(d_2_0_Core->refs.load());
}
if (d_2_1_Core) {
d_2_1_Core->refs.deref();
Q_ASSERT(d_2_1_Core->refs.load());
if (d_3_0_Core)
Q_ASSERT(d_2_1_Core->refs.load());
}
if (d_3_0_Core) {
d_3_0_Core->refs.deref();
Q_ASSERT(d_3_0_Core->refs.load());
if (d_3_1_Core)
Q_ASSERT(d_3_0_Core->refs.load());
}
if (d_3_1_Core) {
d_3_1_Core->refs.deref();
Q_ASSERT(d_3_1_Core->refs.load());
if (d_3_2_Core)
Q_ASSERT(d_3_1_Core->refs.load());
}
if (d_3_2_Core) {
d_3_2_Core->refs.deref();
Q_ASSERT(d_3_2_Core->refs.load());
if (d_3_3_Core)
Q_ASSERT(d_3_2_Core->refs.load());
}
if (d_3_3_Core) {
d_3_3_Core->refs.deref();
Q_ASSERT(d_3_3_Core->refs.load());
if (d_4_0_Core)
Q_ASSERT(d_3_3_Core->refs.load());
}
if (d_4_0_Core) {
d_4_0_Core->refs.deref();
Q_ASSERT(d_4_0_Core->refs.load());
if (d_4_1_Core)
Q_ASSERT(d_4_0_Core->refs.load());
}
if (d_4_1_Core) {
d_4_1_Core->refs.deref();
Q_ASSERT(d_4_1_Core->refs.load());
if (d_4_2_Core)
Q_ASSERT(d_4_1_Core->refs.load());
}
if (d_4_2_Core) {
d_4_2_Core->refs.deref();
Q_ASSERT(d_4_2_Core->refs.load());
if (d_4_3_Core)
Q_ASSERT(d_4_2_Core->refs.load());
}
if (d_4_3_Core) {
d_4_3_Core->refs.deref();
Q_ASSERT(d_4_3_Core->refs.load());
if (d_4_4_Core)
Q_ASSERT(d_4_3_Core->refs.load());
}
if (d_4_4_Core) {
d_4_4_Core->refs.deref();
Q_ASSERT(d_4_4_Core->refs.load());
Q_ASSERT(d_4_4_Core->refs.load());
}
}
bool QOpenGLFunctions_4_4_Core::initializeOpenGLFunctions()

125
src/gui/opengl/qopenglfunctions_4_5_compatibility.cpp
View File

@ -97,81 +97,106 @@ QOpenGLFunctions_4_5_Compatibility::QOpenGLFunctions_4_5_Compatibility()
QOpenGLFunctions_4_5_Compatibility::~QOpenGLFunctions_4_5_Compatibility()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_3_Core)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_3_Core) {
d_1_3_Core->refs.deref();
Q_ASSERT(d_1_3_Core->refs.load());
if (d_1_4_Core)
Q_ASSERT(d_1_3_Core->refs.load());
}
if (d_1_4_Core) {
d_1_4_Core->refs.deref();
Q_ASSERT(d_1_4_Core->refs.load());
if (d_1_5_Core)
Q_ASSERT(d_1_4_Core->refs.load());
}
if (d_1_5_Core) {
d_1_5_Core->refs.deref();
Q_ASSERT(d_1_5_Core->refs.load());
if (d_2_0_Core)
Q_ASSERT(d_1_5_Core->refs.load());
}
if (d_2_0_Core) {
d_2_0_Core->refs.deref();
Q_ASSERT(d_2_0_Core->refs.load());
if (d_2_1_Core)
Q_ASSERT(d_2_0_Core->refs.load());
}
if (d_2_1_Core) {
d_2_1_Core->refs.deref();
Q_ASSERT(d_2_1_Core->refs.load());
if (d_3_0_Core)
Q_ASSERT(d_2_1_Core->refs.load());
}
if (d_3_0_Core) {
d_3_0_Core->refs.deref();
Q_ASSERT(d_3_0_Core->refs.load());
if (d_3_1_Core)
Q_ASSERT(d_3_0_Core->refs.load());
}
if (d_3_1_Core) {
d_3_1_Core->refs.deref();
Q_ASSERT(d_3_1_Core->refs.load());
if (d_3_2_Core)
Q_ASSERT(d_3_1_Core->refs.load());
}
if (d_3_2_Core) {
d_3_2_Core->refs.deref();
Q_ASSERT(d_3_2_Core->refs.load());
if (d_3_3_Core)
Q_ASSERT(d_3_2_Core->refs.load());
}
if (d_3_3_Core) {
d_3_3_Core->refs.deref();
Q_ASSERT(d_3_3_Core->refs.load());
if (d_4_0_Core)
Q_ASSERT(d_3_3_Core->refs.load());
}
if (d_4_0_Core) {
d_4_0_Core->refs.deref();
Q_ASSERT(d_4_0_Core->refs.load());
if (d_4_1_Core)
Q_ASSERT(d_4_0_Core->refs.load());
}
if (d_4_1_Core) {
d_4_1_Core->refs.deref();
Q_ASSERT(d_4_1_Core->refs.load());
if (d_4_2_Core)
Q_ASSERT(d_4_1_Core->refs.load());
}
if (d_4_2_Core) {
d_4_2_Core->refs.deref();
Q_ASSERT(d_4_2_Core->refs.load());
if (d_4_3_Core)
Q_ASSERT(d_4_2_Core->refs.load());
}
if (d_4_3_Core) {
d_4_3_Core->refs.deref();
Q_ASSERT(d_4_3_Core->refs.load());
if (d_4_4_Core)
Q_ASSERT(d_4_3_Core->refs.load());
}
if (d_4_4_Core) {
d_4_4_Core->refs.deref();
Q_ASSERT(d_4_4_Core->refs.load());
if (d_4_5_Core)
Q_ASSERT(d_4_4_Core->refs.load());
}
if (d_4_5_Core) {
d_4_5_Core->refs.deref();
Q_ASSERT(d_4_5_Core->refs.load());
if (d_1_0_Deprecated)
Q_ASSERT(d_4_5_Core->refs.load());
}
if (d_1_0_Deprecated) {
d_1_0_Deprecated->refs.deref();
Q_ASSERT(d_1_0_Deprecated->refs.load());
if (d_1_1_Deprecated)
Q_ASSERT(d_1_0_Deprecated->refs.load());
}
if (d_1_1_Deprecated) {
d_1_1_Deprecated->refs.deref();
Q_ASSERT(d_1_1_Deprecated->refs.load());
if (d_1_2_Deprecated)
Q_ASSERT(d_1_1_Deprecated->refs.load());
}
if (d_1_2_Deprecated) {
d_1_2_Deprecated->refs.deref();
Q_ASSERT(d_1_2_Deprecated->refs.load());
if (d_1_3_Deprecated)
Q_ASSERT(d_1_2_Deprecated->refs.load());
}
if (d_1_3_Deprecated) {
d_1_3_Deprecated->refs.deref();
Q_ASSERT(d_1_3_Deprecated->refs.load());
if (d_1_4_Deprecated)
Q_ASSERT(d_1_3_Deprecated->refs.load());
}
if (d_1_4_Deprecated) {
d_1_4_Deprecated->refs.deref();
Q_ASSERT(d_1_4_Deprecated->refs.load());
if (d_3_3_Deprecated)
Q_ASSERT(d_1_4_Deprecated->refs.load());
}
if (d_3_3_Deprecated) {
d_3_3_Deprecated->refs.deref();
Q_ASSERT(d_3_3_Deprecated->refs.load());
if (d_4_5_Deprecated)
Q_ASSERT(d_3_3_Deprecated->refs.load());
}
if (d_4_5_Deprecated) {
d_4_5_Deprecated->refs.deref();
Q_ASSERT(d_4_5_Deprecated->refs.load());
Q_ASSERT(d_4_5_Deprecated->refs.load());
}
}
bool QOpenGLFunctions_4_5_Compatibility::initializeOpenGLFunctions()

90
src/gui/opengl/qopenglfunctions_4_5_core.cpp
View File

@ -90,60 +90,78 @@ QOpenGLFunctions_4_5_Core::QOpenGLFunctions_4_5_Core()
QOpenGLFunctions_4_5_Core::~QOpenGLFunctions_4_5_Core()
{
if (d_1_0_Core)
if (d_1_0_Core) {
d_1_0_Core->refs.deref();
Q_ASSERT(d_1_0_Core->refs.load());
if (d_1_1_Core)
Q_ASSERT(d_1_0_Core->refs.load());
}
if (d_1_1_Core) {
d_1_1_Core->refs.deref();
Q_ASSERT(d_1_1_Core->refs.load());
if (d_1_2_Core)
Q_ASSERT(d_1_1_Core->refs.load());
}
if (d_1_2_Core) {
d_1_2_Core->refs.deref();
Q_ASSERT(d_1_2_Core->refs.load());
if (d_1_3_Core)
Q_ASSERT(d_1_2_Core->refs.load());
}
if (d_1_3_Core) {
d_1_3_Core->refs.deref();
Q_ASSERT(d_1_3_Core->refs.load());
if (d_1_4_Core)
Q_ASSERT(d_1_3_Core->refs.load());
}
if (d_1_4_Core) {
d_1_4_Core->refs.deref();
Q_ASSERT(d_1_4_Core->refs.load());
if (d_1_5_Core)
Q_ASSERT(d_1_4_Core->refs.load());
}
if (d_1_5_Core) {
d_1_5_Core->refs.deref();
Q_ASSERT(d_1_5_Core->refs.load());
if (d_2_0_Core)
Q_ASSERT(d_1_5_Core->refs.load());
}
if (d_2_0_Core) {
d_2_0_Core->refs.deref();
Q_ASSERT(d_2_0_Core->refs.load());
if (d_2_1_Core)
Q_ASSERT(d_2_0_Core->refs.load());
}
if (d_2_1_Core) {
d_2_1_Core->refs.deref();
Q_ASSERT(d_2_1_Core->refs.load());
if (d_3_0_Core)
Q_ASSERT(d_2_1_Core->refs.load());
}
if (d_3_0_Core) {
d_3_0_Core->refs.deref();
Q_ASSERT(d_3_0_Core->refs.load());
if (d_3_1_Core)
Q_ASSERT(d_3_0_Core->refs.load());
}
if (d_3_1_Core) {
d_3_1_Core->refs.deref();
Q_ASSERT(d_3_1_Core->refs.load());
if (d_3_2_Core)
Q_ASSERT(d_3_1_Core->refs.load());
}
if (d_3_2_Core) {
d_3_2_Core->refs.deref();
Q_ASSERT(d_3_2_Core->refs.load());
if (d_3_3_Core)
Q_ASSERT(d_3_2_Core->refs.load());
}
if (d_3_3_Core) {
d_3_3_Core->refs.deref();
Q_ASSERT(d_3_3_Core->refs.load());
if (d_4_0_Core)
Q_ASSERT(d_3_3_Core->refs.load());
}
if (d_4_0_Core) {
d_4_0_Core->refs.deref();
Q_ASSERT(d_4_0_Core->refs.load());
if (d_4_1_Core)
Q_ASSERT(d_4_0_Core->refs.load());
}
if (d_4_1_Core) {
d_4_1_Core->refs.deref();
Q_ASSERT(d_4_1_Core->refs.load());
if (d_4_2_Core)
Q_ASSERT(d_4_1_Core->refs.load());
}
if (d_4_2_Core) {
d_4_2_Core->refs.deref();
Q_ASSERT(d_4_2_Core->refs.load());
if (d_4_3_Core)
Q_ASSERT(d_4_2_Core->refs.load());
}
if (d_4_3_Core) {
d_4_3_Core->refs.deref();
Q_ASSERT(d_4_3_Core->refs.load());
if (d_4_4_Core)
Q_ASSERT(d_4_3_Core->refs.load());
}
if (d_4_4_Core) {
d_4_4_Core->refs.deref();
Q_ASSERT(d_4_4_Core->refs.load());
if (d_4_5_Core)
Q_ASSERT(d_4_4_Core->refs.load());
}
if (d_4_5_Core) {
d_4_5_Core->refs.deref();
Q_ASSERT(d_4_5_Core->refs.load());
Q_ASSERT(d_4_5_Core->refs.load());
}
}
bool QOpenGLFunctions_4_5_Core::initializeOpenGLFunctions()