storm-1100: merged many more updates and refinements to table, added tester and files to test with

doc/contributions.txt

@@ -449,6 +449,8 @@ Lance Corrimal
 	VWR-25269
 Latif Khalifa
 	VWR-5370
+leliel Mirihi
+	STORM-1100
 Lisa Lowe
 	CT-218
 	CT-219
@@ -748,6 +750,8 @@ Strife Onizuka
 	VWR-2265
 	VWR-4111
 	SNOW-691
+TankMaster Finesmith
+	STORM-1100
 Tayra Dagostino
 	SNOW-517
 	SNOW-543
@@ -806,6 +810,8 @@ Tofu Buzzard
 	STORM-546
 TraductoresAnonimos Alter
 	CT-324
+TriloByte Zanzibar
+	STORM-1100
 Tue Torok
 	CT-68
 	CT-69

indra/newview/llfeaturemanager.cpp

@@ -203,7 +203,7 @@ BOOL LLFeatureManager::maskFeatures(const std::string& name)
  		LL_DEBUGS("RenderInit") << "Unknown feature mask " << name << LL_ENDL;
 		return FALSE;
 	}
-	LL_DEBUGS("RenderInit") << "Applying Feature Mask: " << name << LL_ENDL;
+	LL_INFOS("RenderInit") << "Applying GPU Feature list: " << name << LL_ENDL;
 	return maskList(*maskp);
 }
 
@@ -459,6 +459,10 @@ void LLFeatureManager::parseGPUTable(std::string filename)
 	if ( gpuFound )
 	{
 		LL_INFOS("RenderInit") << "GPU '" << rawRenderer << "' recognized as '" << mGPUString << "'" << LL_ENDL;
+		if (!mGPUSupported)
+		{
+			LL_INFOS("RenderInit") << "GPU '" << mGPUString << "' is not supported." << LL_ENDL;
+		}
 	}
 	else
 	{

indra/newview/tests/gpu_table_tester → scripts/gpu_table_tester

@@ -66,6 +66,7 @@ open(GPUS, "<$GpuTable")
 my %NameLine;       # name -> line number on which a given name was found (catches duplicate names)
 my %RecognizerLine; # name -> line number on which a given name was found (catches duplicate names)
 my %Name;           # recognizer -> name
+my %Recognizer;     # name -> recognizer
 my %Class;          # recognizer -> class
 my %Supported;      # recognizer -> supported
 my @InOrder;        # records the order of the recognizers
@@ -90,7 +91,9 @@ while (<GPUS>)
     }
     elsif ( defined $NameLine{$name} )
     {
-        print STDERR "Duplicate name ($name) found on $GpuTable lines $NameLine{$name} and $INPUT_LINE_NUMBER (ignored)\n";
+        print STDERR "Duplicate name '$name' on $GpuTable lines $NameLine{$name} and $INPUT_LINE_NUMBER:\n";
+        print STDERR "     $NameLine{$name}: /$Recognizer{$name}/  $Supported{$Recognizer{$name}}  class $Class{$Recognizer{$name}}\n";
+        print STDERR "     $INPUT_LINE_NUMBER: /$regex/  " . ($supported ? "supported" : "unsupported") .  " class $class - ignored\n";
         $ErrorsSeen++;
     }
     if (!$regex)
@@ -100,7 +103,9 @@ while (<GPUS>)
     }
     elsif ( defined $RecognizerLine{$regex} )
     {
-        print STDERR "Duplicate recognizer '$regex' found on $GpuTable lines $RecognizerLine{$regex} and $INPUT_LINE_NUMBER (ignored)\n";
+        print STDERR "Duplicate recognizer /$regex/ found on $GpuTable lines $RecognizerLine{$regex} and $INPUT_LINE_NUMBER (ignored)\n";
+        print STDERR "     $RecognizerLine{$regex}: name '$Name{$regex}'  $Supported{$regex}  class $Class{$regex}\n";
+        print STDERR "     $INPUT_LINE_NUMBER: name '$name'  " . ($supported ? "supported" : "unsupported") .  "  class $class - ignored\n";
         $ErrorsSeen++;
     }
     if ($class !~ m/[0123]/)
@@ -125,6 +130,7 @@ while (<GPUS>)
         $NameLine{$name} = $INPUT_LINE_NUMBER;
         $RecognizerLine{$regex} = $INPUT_LINE_NUMBER;
         $Name{$regex} = $name;
+        $Recognizer{$name} = $regex;
         $Class{$regex} = $class;
         $Supported{$regex} = $supported ? "supported" : "unsupported";
     }
@@ -132,6 +138,8 @@ while (<GPUS>)
 
 close GPUS;
 
+print STDERR "\n" if $ErrorsSeen;
+
 exit $ErrorsSeen if $TableOnly;
 
 my %RecognizedBy;