Revert of Add predfined configs for msaa4, nvpr4, nvpr4dit, and srgb that explictly use OpenGL rather than GL…

tools/dm_flags.py

 #
 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 
 #!/usr/bin/env python
 
 usage = '''
@@ skipping 32 matching lines @@
   if '-TSAN' not in bot:
     if ('TegraK1'  in bot or
         'GTX550Ti' in bot or
         'GTX660'   in bot or
         'GT610'    in bot):
       if 'Android' in bot:
         configs.append('nvprdit4')
       else:
         configs.append('nvprdit16')
 
-  # We want to test the OpenGL config not the GLES config on the X1
-  if 'TegraX1' in bot:
-    configs.remove('gpu')
-    configs.remove('gpusrgb')
-    configs.append('gl')
-    configs.append('glsrgb')
-    
   # The S4 crashes and the NP produces a long error stream when we run with
   # MSAA.  The Tegra2 and Tegra3 just don't support it.
   if ('GalaxyS4'    not in bot and
       'NexusPlayer' not in bot and
       'Tegra3'      not in bot and
       'iOS'         not in bot):
     if 'Android' in bot:
       configs.append('msaa4')
     else:
       configs.append('msaa16')
@@ skipping 191 matching lines @@
     'Test-Android-GCC-GalaxyS4-GPU-SGX544-Arm7-Release',
     'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release',
     'Test-Android-GCC-NexusPlayer-CPU-SSSE3-x86-Release',
     'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
     'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN',
     'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN',
     'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Valgrind',
     'Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Debug-ANGLE',
     'Test-Mac10.8-Clang-MacMini4.1-CPU-SSE4-x86_64-Release',
     'Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release',
-    'Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Release',
   ]
 
   cov = coverage.coverage()
   cov.start()
   for case in cases:
     args[case] = get_args(case)
   cov.stop()
 
   this_file = os.path.basename(__file__)
   _, _, not_run, _ = cov.analysis(this_file)
@@ skipping 11 matching lines @@
   if len(sys.argv) == 2 and sys.argv[1] == 'test':
     self_test()
     sys.exit(0)
 
   if len(sys.argv) != 3:
     print usage
     sys.exit(1)
 
   with open(sys.argv[1], 'w') as out:
     json.dump(get_args(sys.argv[2]), out)