Nux

Merge lp:~3v1n0/nux/support-test-llvmpipe-check into lp:nux

Proposed by Marco Trevisan (Treviño) on 2016-07-01
Status: Merged
Approved by: Eleni Maria Stea on 2016-07-01
Approved revision: 879
Merged at revision: 878
Proposed branch: lp:~3v1n0/nux/support-test-llvmpipe-check
Merge into: lp:nux
Diff against target: 63 lines (+6/-17)
3 files modified
debian/patches/01_blacklist_llvmpipe.patch (+0/-12)
debian/patches/series (+0/-1)
tools/unity_support_test.c (+6/-4)
To merge this branch: bzr merge lp:~3v1n0/nux/support-test-llvmpipe-check
Reviewer Review Type Date Requested Status
Unity Team 2016-07-01 Pending
Review via email: mp+298926@code.launchpad.net

Commit message

unity_support_test: add llvmpipe as software-rendererd

To post a comment you must log in.
880. By Marco Trevisan (Treviño) on 2016-07-01

unity_support_test: don't return an error if help has been requested

881. By Marco Trevisan (Treviño) on 2016-07-05

debian/patches: remove patch for llvmpipe blacklisting

882. By Marco Trevisan (Treviño) on 2016-07-05

unity_support_test: add -f / --force-check to the help

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed directory 'debian/patches'
2=== removed file 'debian/patches/01_blacklist_llvmpipe.patch'
3--- debian/patches/01_blacklist_llvmpipe.patch 2012-02-27 10:23:10 +0000
4+++ debian/patches/01_blacklist_llvmpipe.patch 1970-01-01 00:00:00 +0000
5@@ -1,12 +0,0 @@
6-Index: ubuntu/tools/unity_support_test.c
7-===================================================================
8---- ubuntu.orig/tools/unity_support_test.c 2012-01-13 09:01:58.714180000 +0100
9-+++ ubuntu/tools/unity_support_test.c 2012-02-27 11:16:53.435617058 +0100
10-@@ -587,6 +587,7 @@
11- if (results->renderer != NULL &&
12- (strncmp (results->renderer, "Software Rasterizer", 19) == 0 ||
13- strncmp (results->renderer, "Mesa X11", 8) == 0 ||
14-+ strstr (results->renderer, "llvmpipe") != NULL ||
15- strstr (results->renderer, "on softpipe") != NULL)) {
16- results->flags |= FLAG_SOFTWARE_RENDERING;
17- }
18
19=== removed file 'debian/patches/series'
20--- debian/patches/series 2012-08-01 16:09:01 +0000
21+++ debian/patches/series 1970-01-01 00:00:00 +0000
22@@ -1,1 +0,0 @@
23-01_blacklist_llvmpipe.patch
24
25=== modified file 'tools/unity_support_test.c'
26--- tools/unity_support_test.c 2013-11-01 13:09:43 +0000
27+++ tools/unity_support_test.c 2016-07-05 00:33:18 +0000
28@@ -158,6 +158,7 @@
29 " -i, --indirect: Force an indirect rendering context\n"
30 " -p, --print: Print detection results on stdout\n"
31 " -c, --compiz: Only check for Compiz support\n"
32+ " -f --force-check Force checking already performed tests\n"
33 " -h, --help: Show help\n");
34 }
35
36@@ -587,14 +588,15 @@
37 if (results->renderer != NULL &&
38 (strncmp (results->renderer, "Software Rasterizer", 19) == 0 ||
39 strncmp (results->renderer, "Mesa X11", 8) == 0 ||
40- strstr (results->renderer, "on softpipe") != NULL)) {
41+ strstr (results->renderer, "llvmpipe") ||
42+ strstr (results->renderer, "on softpipe"))) {
43 results->flags |= FLAG_SOFTWARE_RENDERING;
44 }
45
46 // jaytaoko: Balcklist the Geforce FX cards
47 if (results->renderer != NULL) {
48- char* str = strstr (results->renderer, "GeForce FX");
49- if (str != NULL) {
50+ if (strstr (results->renderer, "GeForce FX") ||
51+ (getenv("UNITY_LOW_GFX_MODE") != NULL && atoi(getenv("UNITY_LOW_GFX_MODE")) == 1)) {
52 results->flags |= FLAG_BLACKLISTED;
53 }
54 }
55@@ -696,7 +698,7 @@
56 } else if ((strncmp (argv[i], "-h", 2) == 0) ||
57 (strncmp (argv[i], "--help", 6) == 0)) {
58 print_help ();
59- return 2;
60+ return 0;
61 } else {
62 fprintf (stderr, "Error: unknown command-line option `%s'\n\n", argv[i]);
63 print_help ();

Subscribers

People subscribed via source and target branches