summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-10-25 11:16:44 -0700
committerGraham Linden <graham@lindenlab.com>2013-10-25 11:16:44 -0700
commitd4e622daf2775147c75a75389ffb9b55f8cef799 (patch)
tree3b2ea43d196dbf166b152436fb54be6cf691cdbc /indra/newview
parent6480612a91b0e72fa746d294d8cade4f093c9372 (diff)
MAINT-3356 GPU Table update to support Retina MBP 'Intel Iris OpenGL Engine' driver id on Mavericks.
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/gpu_table.txt1
-rwxr-xr-xindra/newview/tests/gpus_results.txt1
-rwxr-xr-xindra/newview/tests/gpus_seen.txt1
3 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt
index 0acdf9661a..86969475c6 100755
--- a/indra/newview/gpu_table.txt
+++ b/indra/newview/gpu_table.txt
@@ -325,6 +325,7 @@ 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 Intel Iris OpenGL Engine .*Intel.*Iris OpenGL.* 4 1 0 4
Intel HD Graphics 5000 .*Intel.*HD Graphics 5.* 4 1 0 4
Intel HD Graphics .*Intel.*HD Graphics.* 2 1 1 4
Intel Mobile 4 Series .*Intel.*Mobile.* 4 Series.* 0 1 1 2.1
diff --git a/indra/newview/tests/gpus_results.txt b/indra/newview/tests/gpus_results.txt
index 5ffbc0a9e5..106593afd5 100755
--- a/indra/newview/tests/gpus_results.txt
+++ b/indra/newview/tests/gpus_results.txt
@@ -1444,6 +1444,7 @@ Intel Intel(R) HD Graphics Family
Intel Intel(R) HD Graphics P3000 supported 2 1 4 Intel HD Graphics
Intel Intel(R) HD Graphics P4000 supported 2 1 4 Intel HD Graphics
Intel Intel(R) Q45/Q43 Express Chipset supported 1 1 2.1 Intel Q45/Q43
+Intel Iris OpenGL Graphics Engine supported 4 0 4 Intel Intel Iris OpenGL Engine
Intel Mobile 4 Series supported 0 1 2.1 Intel Mobile 4 Series
Intel Mobile Intel(R) 4 Series Express Chipset Family supported 0 1 2.1 Intel Mobile 4 Series
Intel Mobile Intel(R) 4 Series Express Chipset Family v2 supported 0 1 2.1 Intel Mobile 4 Series
diff --git a/indra/newview/tests/gpus_seen.txt b/indra/newview/tests/gpus_seen.txt
index f44aa56cbd..a417cb3761 100755
--- a/indra/newview/tests/gpus_seen.txt
+++ b/indra/newview/tests/gpus_seen.txt
@@ -1908,6 +1908,7 @@ Intel Intel(R) HD Graphics P3000
Intel Intel(R) HD Graphics P4000
Intel Intel(R) Q45/Q43 Express Chipset
Intel Intel(R) Q45/Q43 Express Chipset
+Intel Iris OpenGL Graphics Engine
Intel Mobile 4 Series
Intel Mobile Intel(R) 4 Series Express Chipset Family
Intel Mobile Intel(R) 4 Series Express Chipset Family