summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-09-13 12:40:37 -0400
committerOz Linden <oz@lindenlab.com>2011-09-13 12:40:37 -0400
commit48e1a563abfb64b119c47343d0340c8e14c188d5 (patch)
tree6fa61071a6a3a8d4676fae5e2df21bb190de22c6
parentd982b33f708181b7d1007c5a993445a054f0cc16 (diff)
VWR-26622: correct recognition of Intel Mobile 4 Series GPUs
-rw-r--r--doc/contributions.txt1
-rw-r--r--indra/newview/gpu_table.txt2
-rw-r--r--indra/newview/tests/gpus_results.txt1
-rw-r--r--indra/newview/tests/gpus_seen.txt1
4 files changed, 4 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 5930bab04f..94f8110aed 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1029,6 +1029,7 @@ Synystyr Texan
Takeda Terrawyng
TankMaster Finesmith
STORM-1100
+ VWR-26622
Talamasca
Tali Rosca
Tayra Dagostino
diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt
index 9dad3fe762..86e3bac186 100644
--- a/indra/newview/gpu_table.txt
+++ b/indra/newview/gpu_table.txt
@@ -283,7 +283,7 @@ Intel Cantiga .*Intel.*Cantiga.* 0 0
Intel Eaglelake .*Intel.*Eaglelake.* 0 1
Intel Graphics Media HD .*Intel.*Graphics Media.*HD.* 0 1
Intel HD Graphics .*Intel.*HD Graphics.* 2 1
-Intel Mobile 4 Series .*Intel.*Mobile *4 Series.* 0 1
+Intel Mobile 4 Series .*Intel.*Mobile.* 4 Series.* 0 1
Intel Media Graphics HD .*Intel.*Media Graphics HD.* 0 1
Intel Montara .*Intel.*Montara.* 0 0
Intel Pineview .*Intel.*Pineview.* 0 1
diff --git a/indra/newview/tests/gpus_results.txt b/indra/newview/tests/gpus_results.txt
index 8723554ee6..39ad5bf695 100644
--- a/indra/newview/tests/gpus_results.txt
+++ b/indra/newview/tests/gpus_results.txt
@@ -741,6 +741,7 @@ Intel Mobile 4 Series
Intel Mobile 4 Series Express Chipset Family supported 0 Intel Mobile 4 Series
Intel Mobile 45 Express Chipset Family (Microsoft Corporation - WDDM 1.1) UNRECOGNIZED
Intel Mobile HD Graphics supported 2 Intel HD Graphics
+Intel Mobile Intel(R) 4 Series Express Chipset Family supported 0 Intel Mobile 4 Series
Intel Mobile SandyBridge HD Graphics supported 2 Intel HD Graphics
Intel Montara unsupported 0 Intel Montara
Intel Pineview supported 0 Intel Pineview
diff --git a/indra/newview/tests/gpus_seen.txt b/indra/newview/tests/gpus_seen.txt
index c807f22b58..98b4adcf39 100644
--- a/indra/newview/tests/gpus_seen.txt
+++ b/indra/newview/tests/gpus_seen.txt
@@ -739,6 +739,7 @@ Intel Mobile 4 Series
Intel Mobile 4 Series Express Chipset Family
Intel Mobile 45 Express Chipset Family (Microsoft Corporation - WDDM 1.1)
Intel Mobile HD Graphics
+Intel Mobile Intel(R) 4 Series Express Chipset Family
Intel Mobile SandyBridge HD Graphics
Intel Montara
Intel Pineview