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/tests | |
| 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/tests')
| -rwxr-xr-x | indra/newview/tests/gpus_results.txt | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/indra/newview/tests/gpus_results.txt b/indra/newview/tests/gpus_results.txt index 1cd3654446..0d126191f3 100755 --- a/indra/newview/tests/gpus_results.txt +++ b/indra/newview/tests/gpus_results.txt @@ -1394,13 +1394,13 @@ Intel G41 Intel G45 supported 1 1 2.1 Intel G45 Intel Graphics Media HD supported 1 1 2.1 Intel Graphics Media HD Intel HD Graphics supported 2 1 4 Intel HD Graphics -Intel HD Graphics 2000 supported 2 0 3.1 Intel HD Graphics 2000 -Intel HD Graphics 3000 supported 3 1 3.1 Intel HD Graphics 3000 -Intel HD Graphics 4000 supported 3 1 4 Intel HD Graphics 4000 +Intel HD Graphics 2000 supported 2 0 4.2 Intel HD Graphics 2000 +Intel HD Graphics 3000 supported 3 1 4.2 Intel HD Graphics 3000 +Intel HD Graphics 4000 supported 3 1 4.2 Intel HD Graphics 4000 Intel Inc. Intel GMA 950 OpenGL Engine supported 0 1 1.4 Intel 950 Intel Inc. Intel GMA X3100 OpenGL Engine supported 1 1 2.1 Intel X3100 -Intel Inc. Intel HD Graphics 3000 OpenGL Engine supported 3 1 3.1 Intel HD Graphics 3000 -Intel Inc. Intel HD Graphics 4000 OpenGL Engine supported 3 1 4 Intel HD Graphics 4000 +Intel Inc. Intel HD Graphics 3000 OpenGL Engine supported 3 1 4.2 Intel HD Graphics 3000 +Intel Inc. Intel HD Graphics 4000 OpenGL Engine supported 3 1 4.2 Intel HD Graphics 4000 Intel Inc. Intel HD Graphics 5000 OpenGL Engine supported 4 0 4 Intel HD Graphics 5000 Intel Inc. Intel HD Graphics OpenGL Engine supported 2 1 4 Intel HD Graphics Intel Intel 845G unsupported 0 1 1.4 Intel 845G @@ -1432,12 +1432,12 @@ Intel Intel(R) G45/G43/G41 Express Chipset Intel Intel(R) Graphics Media Accelerator HD supported 1 1 2.1 Intel Graphics Media HD Intel Intel(R) HD Graphics supported 2 1 4 Intel HD Graphics Intel Intel(R) HD Graphics 100 supported 2 1 4 Intel HD Graphics -Intel Intel(R) HD Graphics 2000 supported 2 0 3.1 Intel HD Graphics 2000 -Intel Intel(R) HD Graphics 2500 supported 2 0 4 Intel HD Graphics 2500 -Intel Intel(R) HD Graphics 3000 supported 3 1 3.1 Intel HD Graphics 3000 -Intel Intel(R) HD Graphics 4000 supported 3 1 4 Intel HD Graphics 4000 -Intel Intel(R) HD Graphics 4400 supported 3 0 4 Intel HD Graphics 4400 -Intel Intel(R) HD Graphics 4600 supported 3 0 4 Intel HD Graphics 4600 +Intel Intel(R) HD Graphics 2000 supported 2 0 4.2 Intel HD Graphics 2000 +Intel Intel(R) HD Graphics 2500 supported 2 0 4.2 Intel HD Graphics 2500 +Intel Intel(R) HD Graphics 3000 supported 3 1 4.2 Intel HD Graphics 3000 +Intel Intel(R) HD Graphics 4000 supported 3 1 4.2 Intel HD Graphics 4000 +Intel Intel(R) HD Graphics 4400 supported 3 0 4.2 Intel HD Graphics 4400 +Intel Intel(R) HD Graphics 4600 supported 3 0 4.2 Intel HD Graphics 4600 Intel Intel(R) HD Graphics 5000 supported 4 0 4 Intel HD Graphics 5000 Intel Intel(R) HD Graphics BR-1004-01Y1 supported 2 1 4 Intel HD Graphics Intel Intel(R) HD Graphics Family supported 2 1 4 Intel HD Graphics @@ -2913,8 +2913,8 @@ Parallels and ATI Technologies Inc. Parallels using ATI Radeon HD 6770M OpenGL E Parallels and ATI Technologies Inc. Parallels using ATI Radeon HD 6970M OpenGL Engine supported 5 1 4.2 ATI Radeon HD 6900 Parallels and ATI Technologies Inc. Parallels using ATI Radeon X1600 OpenGL Engine supported 2 1 2.1 ATI Radeon X1600 Parallels and Intel Inc. Parallels using Intel GMA X3100 OpenGL Engine supported 1 1 2.1 Intel X3100 -Parallels and Intel Inc. Parallels using Intel HD Graphics 3000 OpenGL Engine supported 3 1 3.1 Intel HD Graphics 3000 -Parallels and Intel Inc. Parallels using Intel HD Graphics 4000 OpenGL Engine supported 3 1 4 Intel HD Graphics 4000 +Parallels and Intel Inc. Parallels using Intel HD Graphics 3000 OpenGL Engine supported 3 1 4.2 Intel HD Graphics 3000 +Parallels and Intel Inc. Parallels using Intel HD Graphics 4000 OpenGL Engine supported 3 1 4.2 Intel HD Graphics 4000 Parallels and NVIDIA Corporation Parallels using NVIDIA GeForce 320M OpenGL Engine supported 2 0 3.3 NVIDIA 320M Parallels and NVIDIA Corporation Parallels using NVIDIA GeForce 8800 GS OpenGL Engine supported 3 1 3.3 NVIDIA GeForce 8800 Parallels and NVIDIA Corporation Parallels using NVIDIA GeForce 9400 OpenGL Engine supported 3 1 3.3 NVIDIA GeForce 9400 |