From 50ba5fa130134a09b4be5ec503681539315c7af3 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Wed, 12 Sep 2012 14:36:00 +0100 Subject: [PATCH] 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 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cogl/cogl-gpu-info.c b/cogl/cogl-gpu-info.c index 8e64d04b6..5bb0e6592 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