ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Read mesa version in better way.

Browse Source 
It solves the problem with OpenGL ES, because there is one more word in the version string:
OpenGL version string: OpenGL ES 3.0 Mesa 11.2.2
This commit is contained in:
deve
2016-07-05 12:17:40 +02:00
parent 93dde11562
commit e42673c4ac
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/graphics/graphics_restrictions.cpp
View File

@@ -139,12 +139,16 @@ public:
std::vector<std::string> l = StringUtils::split(driver, ' ');
if (l.size() > 2)
{
// driver can be: "1.4 (3.0 Mesa 10.1.0)" --> l[3] must be used
if (l[2] != "Mesa")
convertVersionString(l[2]);
else
convertVersionString(l[3]);
return;
// driver can be: "1.4 (3.0 Mesa 10.1.0)" -->
// we use value next to "Mesa" word.
for (unsigned int i = 0; i < l.size(); i++)
{
if (l[i] == "Mesa" && i < l.size() - 1)
{
convertVersionString(l[i+1]);
return;
}
}
}
}
@@ -273,7 +277,7 @@ private:
std::string m_card_name;
/** Operators to test version numbers with. */
enum {VERSION_IGNORE, VERSION_EQUAL, VERSION_LESS,
enum {VERSION_IGNORE, VERSION_EQUAL, VERSION_LESS,
VERSION_LESS_EQUAL} m_version_test;
/** Driver version for which this rule applies. */
@@ -356,7 +360,7 @@ public:
case CARD_IS:
if(card!=m_card_name) return false;
break;
case CARD_CONTAINS:
case CARD_CONTAINS:
if(card.find(m_card_name)==std::string::npos)
return false;
break;
@@ -412,7 +416,7 @@ void unitTesting()
assert(Version("10.3") <= Version("10.3.2"));
assert(!(Version("10.3.2") < Version("10.3")));
assert(!(Version("10.3.2") <= Version("10.3")));
assert(Version("3.3 NVIDIA-10.0.19 310.90.10.05b1",
assert(Version("3.3 NVIDIA-10.0.19 310.90.10.05b1",
"NVIDIA GeForce GTX 680MX OpenGL Engine")
== Version("310.90.10.5") );
@@ -423,7 +427,7 @@ void unitTesting()
assert(Version("3.1 (Core Profile) Mesa 10.3.0",
"Mesa DRI Mobile Intel\u00ae GM45 Express Chipset")
== Version("10.3.0") );
assert(Version("3.3 (Core Profile) Mesa 10.5.0-devel",
assert(Version("3.3 (Core Profile) Mesa 10.5.0-devel",
"Gallium 0.4 on NVC1")
== Version("10.5.0") );
assert(Version("3.3 (Core Profile) Mesa 10.5.0-devel",
@@ -441,7 +445,7 @@ void unitTesting()
assert(Version("4.0.10188 Core Profile Context",
"ATI Radeon HD 5400 Series")
== Version("4.0.10188"));
assert(Version("4.1 ATI-1.24.38", "AMD Radeon HD 6970M OpenGL Engine")
assert(Version("4.1 ATI-1.24.38", "AMD Radeon HD 6970M OpenGL Engine")
== Version("1.24.38"));
} // unitTesting