diff options
author | Graham Linden <graham@lindenlab.com> | 2013-09-19 17:39:56 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2013-09-19 17:39:56 -0700 |
commit | d3e954cfaca067adf60f2e3c161028c6549263e4 (patch) | |
tree | 54826d4b8ff8fa7683770876bb654c3afdaaf076 /indra/newview/gpu_table.txt | |
parent | 79836e32d575248642cfd6af837548aac054988f (diff) | |
parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) |
Merge 3.6.6 Materials RC and update Intel HD gpu_table entries to expect GL 4.2 to nag resis to get the fixed Intel driver
Diffstat (limited to 'indra/newview/gpu_table.txt')
-rwxr-xr-x | indra/newview/gpu_table.txt | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt index 291d89d77a..0513c60ba8 100755 --- a/indra/newview/gpu_table.txt +++ b/indra/newview/gpu_table.txt @@ -316,13 +316,13 @@ Intel Brookdale .*Intel.*Brookdale.* 0 0 1 1.3 Intel Cantiga .*Intel.*Cantiga.* 0 0 1 2 Intel Eaglelake .*Intel.*Eaglelake.* 1 1 1 2 Intel Graphics Media HD .*Intel.*Graphics Media.*HD.* 1 1 1 2.1 -Intel HD Graphics 2500 .*Intel.*HD Graphics 25.* 2 1 0 4 -Intel HD Graphics 2000 .*Intel.*HD Graphics 2.* 2 1 0 3.1 -Intel HD Graphics 3000 .*Intel.*HD Graphics 3.* 3 1 1 3.1 -Intel HD Graphics 4200 .*Intel.*HD Graphics 42.* 3 1 0 4 -Intel HD Graphics 4400 .*Intel.*HD Graphics 44.* 3 1 0 4 -Intel HD Graphics 4600 .*Intel.*HD Graphics 46.* 3 1 0 4 -Intel HD Graphics 4000 .*Intel.*HD Graphics 4.* 3 1 1 4 +Intel HD Graphics 2500 .*Intel.*HD Graphics 25.* 2 1 0 4.2 +Intel HD Graphics 2000 .*Intel.*HD Graphics 2.* 2 1 0 4.2 +Intel HD Graphics 3000 .*Intel.*HD Graphics 3.* 3 1 1 4.2 +Intel HD Graphics 4200 .*Intel.*HD Graphics 42.* 3 1 0 4.2 +Intel HD Graphics 4400 .*Intel.*HD Graphics 44.* 3 1 0 4.2 +Intel HD Graphics 4600 .*Intel.*HD Graphics 46.* 3 1 0 4.2 +Intel HD Graphics 4000 .*Intel.*HD Graphics 4.* 3 1 1 4.2 Intel Intel Iris Pro Graphics 5200 .*Intel.*Iris Pro Graphics 52.* 4 1 0 4 Intel Intel Iris Graphics 5100 .*Intel.*Iris Graphics 51.* 4 1 0 4 Intel HD Graphics 5000 .*Intel.*HD Graphics 5.* 4 1 0 4 @@ -656,3 +656,4 @@ Humper Humper.* 0 1 1 2.1 PowerVR SGX545 .*PowerVR SGX.* 1 1 1 3 ATI GeForce Lulz .*ATI.*GeForce.* 0 0 0 0 + |