Nux

Merge lp:~didrocks/nux/disable-blacklist into lp:nux

  1. disable-blacklist
  2. Merge into trunk
Proposed by Didier Roche-Tolomelli
Status: Merged
Approved by: Gord Allott
Approved revision: 336
Merged at revision: 336
Proposed branch: lp:~didrocks/nux/disable-blacklist
Merge into: lp:nux
Diff against target: 28 lines (+10/-1)
1 file modified
tools/unity_support_test.c (+10/-1)
To merge this branch: bzr merge lp:~didrocks/nux/disable-blacklist
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+58469@code.launchpad.net

Description of the change

add cards to the blacklist and enabling user to bypass the check with an
environment variable (LP: #728745, #764379)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/unity_support_test.c'
2--- tools/unity_support_test.c 2011-04-14 13:45:58 +0000
3+++ tools/unity_support_test.c 2011-04-20 10:33:34 +0000
4@@ -72,7 +72,10 @@
5 struct PciDevice gpu_blacklist[] = {
6 { 0x8086, 0x3577 }, // Intel : 82830M/MG
7 { 0x8086, 0x2562 }, // Intel : 82845G aka Poulsbo
8- { 0x1002, 0x4c57 } // ATI : Radeon Mobility 7500
9+ { 0x1002, 0x4c57 }, // ATI : Radeon Mobility 7500
10+ { 0x10de, 0x0240 }, // nVidia: GeForce 6150
11+ { 0x10de, 0x01d7 }, // nVidia: GeForce Go 7300 / Quadro NVS 110M
12+ { 0x10de, 0x01d8 } // nVidia: GeForce Go 7400
13 };
14
15 // Checks whether an extension is supported by the GLX/OpenGL implementation
16@@ -185,6 +188,12 @@
17 char *vendor, *renderer, *version;
18 int result, major, minor;
19
20+ if (getenv ("UNITY_FORCE_START")) {
21+ fprintf (stdout, "Warning: UNITY_FORCE_START enabled, no check for unity or compiz support.\n");
22+ return 0;
23+ }
24+
25+
26 // Basic command-line parsing.
27 for (int i = 1; i < argc; i++) {
28 if (((strncmp (argv[i], "-d", 2) == 0) ||

Subscribers

People subscribed via source and target branches