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

Enable building ANGLE with D3D11 in -opengl dynamic builds. 

Task-number: QTBUG-40193
Change-Id: If70943355d650cd3f20f4ff25fa09417a28a2b93
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
bb10
Laszlo Agocs 2014-07-24 11:07:48 +02:00
parent b84699ae1b
commit 6a80215859
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/configure/configureapp.cpp
View File

@ -2569,8 +2569,9 @@ bool Configure::verifyConfiguration()
}
if (dictionary["DYNAMICGL"] == "yes") {
if (dictionary["OPENGL_ES_2"] == "yes" || dictionary["ANGLE"] != "no") {
cout << "ERROR: Dynamic OpenGL cannot be used together with native Angle (GLES2) builds." << endl;
// Note that d3d11 is still allowed for ANGLE, hence the check for == "yes".
if (dictionary["OPENGL_ES_2"] == "yes" || dictionary["ANGLE"] == "yes") {
cout << "ERROR: Dynamic OpenGL cannot be used with -angle." << endl;
dictionary[ "DONE" ] = "error";
}
}
@ -2656,8 +2657,11 @@ void Configure::generateOutputVars()
}
// Dynamic OpenGL loading ---------------------------------------
if (dictionary[ "DYNAMICGL" ] != "no")
if (dictionary[ "DYNAMICGL" ] != "no") {
qtConfig += "dynamicgl";
if (dictionary[ "ANGLE" ] == "d3d11")
qmakeConfig += "angle_d3d11";
}
// Image formates -----------------------------------------------
if (dictionary[ "GIF" ] == "no")