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
=== removed directory 'debian/patches'
=== removed file 'debian/patches/01_blacklist_llvmpipe.patch'
--- debian/patches/01_blacklist_llvmpipe.patch 2012-02-27 10:23:10 +0000
+++ debian/patches/01_blacklist_llvmpipe.patch 1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
1Index: ubuntu/tools/unity_support_test.c
2===================================================================
3--- ubuntu.orig/tools/unity_support_test.c 2012-01-13 09:01:58.714180000 +0100
4+++ ubuntu/tools/unity_support_test.c 2012-02-27 11:16:53.435617058 +0100
5@@ -587,6 +587,7 @@
6 if (results->renderer != NULL &&
7 (strncmp (results->renderer, "Software Rasterizer", 19) == 0 ||
8 strncmp (results->renderer, "Mesa X11", 8) == 0 ||
9+ strstr (results->renderer, "llvmpipe") != NULL ||
10 strstr (results->renderer, "on softpipe") != NULL)) {
11 results->flags |= FLAG_SOFTWARE_RENDERING;
12 }
130
=== removed file 'debian/patches/series'
--- debian/patches/series 2012-08-01 16:09:01 +0000
+++ debian/patches/series 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
101_blacklist_llvmpipe.patch
20
=== modified file 'tools/unity_support_test.c'
--- tools/unity_support_test.c 2013-11-01 13:09:43 +0000
+++ tools/unity_support_test.c 2016-07-05 00:33:18 +0000
@@ -158,6 +158,7 @@
158 " -i, --indirect: Force an indirect rendering context\n"158 " -i, --indirect: Force an indirect rendering context\n"
159 " -p, --print: Print detection results on stdout\n"159 " -p, --print: Print detection results on stdout\n"
160 " -c, --compiz: Only check for Compiz support\n"160 " -c, --compiz: Only check for Compiz support\n"
161 " -f --force-check Force checking already performed tests\n"
161 " -h, --help: Show help\n");162 " -h, --help: Show help\n");
162}163}
163164
@@ -587,14 +588,15 @@
587 if (results->renderer != NULL &&588 if (results->renderer != NULL &&
588 (strncmp (results->renderer, "Software Rasterizer", 19) == 0 ||589 (strncmp (results->renderer, "Software Rasterizer", 19) == 0 ||
589 strncmp (results->renderer, "Mesa X11", 8) == 0 ||590 strncmp (results->renderer, "Mesa X11", 8) == 0 ||
590 strstr (results->renderer, "on softpipe") != NULL)) {591 strstr (results->renderer, "llvmpipe") ||
592 strstr (results->renderer, "on softpipe"))) {
591 results->flags |= FLAG_SOFTWARE_RENDERING;593 results->flags |= FLAG_SOFTWARE_RENDERING;
592 }594 }
593595
594 // jaytaoko: Balcklist the Geforce FX cards596 // jaytaoko: Balcklist the Geforce FX cards
595 if (results->renderer != NULL) {597 if (results->renderer != NULL) {
596 char* str = strstr (results->renderer, "GeForce FX");598 if (strstr (results->renderer, "GeForce FX") ||
597 if (str != NULL) {599 (getenv("UNITY_LOW_GFX_MODE") != NULL && atoi(getenv("UNITY_LOW_GFX_MODE")) == 1)) {
598 results->flags |= FLAG_BLACKLISTED;600 results->flags |= FLAG_BLACKLISTED;
599 }601 }
600 }602 }
@@ -696,7 +698,7 @@
696 } else if ((strncmp (argv[i], "-h", 2) == 0) ||698 } else if ((strncmp (argv[i], "-h", 2) == 0) ||
697 (strncmp (argv[i], "--help", 6) == 0)) {699 (strncmp (argv[i], "--help", 6) == 0)) {
698 print_help ();700 print_help ();
699 return 2;701 return 0;
700 } else {702 } else {
701 fprintf (stderr, "Error: unknown command-line option `%s'\n\n", argv[i]);703 fprintf (stderr, "Error: unknown command-line option `%s'\n\n", argv[i]);
702 print_help ();704 print_help ();

Subscribers

People subscribed via source and target branches