[cogl/cogl-1.12] gpu-info: Match latest Mesa strings
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/cogl-1.12] gpu-info: Match latest Mesa strings
- Date: Mon, 17 Sep 2012 22:48:59 +0000 (UTC)
commit 50ba5fa130134a09b4be5ec503681539315c7af3
Author: Robert Bragg <robert linux intel com>
Date: Wed Sep 12 14:36:00 2012 +0100
gpu-info: Match latest Mesa strings
Mesa now reports a vendor string of "Mesa Project" instead of "VMWare,
Inc." and the software rasterizer renderer string is now "Software
Rasterizer". This update cogl-gpu-info.c to recognize these new strings.
Thanks to Alexander Larsson for the original patch.
https://bugzilla.gnome.org/show_bug.cgi?id=683818
(cherry picked from commit dfacbbd96f3fbadaffa4a76dfd71c47ece6ed6a3)
cogl/cogl-gpu-info.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/cogl/cogl-gpu-info.c b/cogl/cogl-gpu-info.c
index 8e64d04..5bb0e65 100644
--- a/cogl/cogl-gpu-info.c
+++ b/cogl/cogl-gpu-info.c
@@ -182,6 +182,8 @@ check_mesa_vendor (const CoglGpuInfoStrings *strings)
return TRUE;
else if (strcmp (strings->vendor_string, "VMware, Inc.") == 0)
return TRUE;
+ else if (strcmp (strings->vendor_string, "Mesa Project") == 0)
+ return TRUE;
return FALSE;
}
@@ -214,7 +216,8 @@ check_softpipe_architecture (const CoglGpuInfoStrings *strings)
static CoglBool
check_swrast_architecture (const CoglGpuInfoStrings *strings)
{
- return match_phrase (strings->renderer_string, "software rasterizer");
+ return match_phrase (strings->renderer_string, "software rasterizer") ||
+ match_phrase (strings->renderer_string, "Software Rasterizer");
}
static CoglBool
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]