Use 'apitrace retrace'

[apitrace-tests] / app_driver.py

diff --git a/app_driver.py b/app_driver.py
index ce3b1c43ca3dc16a7f6e041d78c2908754e04e5a..2a935d064af68fb481a70435def33975f76effbc 100755 (executable)
--- a/app_driver.py
+++ b/app_driver.py
@@ -189,7 +189,12 @@ class AppDriver(Driver):
         'egl_gl': 'eglretrace',
         'egl_gles1': 'eglretrace',
         'egl_gles2': 'eglretrace',
+        #'d3d8': 'd3dretrace',
         'd3d9': 'd3dretrace',
+        'd3d10': 'd3dretrace',
+        'd3d10_1': 'd3dretrace',
+        'd3d11': 'd3dretrace',
+        'd3d11_1': 'd3dretrace',
     }
 
     def traceApp(self):
@@ -375,19 +380,9 @@ class AppDriver(Driver):
         except KeyError:
             return
 
-        # On NVIDIA drivers glGetIntegerv(GL_INDEX_WRITEMASK) returns -1
+        # On NVIDIA drivers glGetIntegerv(GL_INDEX_WRITEMASK) returns 255
         self.replaceState(parameters, 'GL_INDEX_WRITEMASK', 255, -1)
 
-        # On Gallium 
-        if 'Gallium' in parameters['GL_RENDERER'].split():
-            # Gallium drivers have wrong defaults for draw/read buffer state
-            self.replaceState(parameters, 'GL_DRAW_BUFFER', 'GL_BACK_LEFT', 'GL_BACK')
-            self.replaceState(parameters, 'GL_DRAW_BUFFER0', 'GL_BACK_LEFT', 'GL_BACK')
-            self.replaceState(parameters, 'GL_READ_BUFFER', 'GL_BACK_LEFT', 'GL_BACK')
-            self.replaceState(parameters, 'GL_DRAW_BUFFER', 'GL_FRONT_LEFT', 'GL_FRONT')
-            self.replaceState(parameters, 'GL_DRAW_BUFFER0', 'GL_FRONT_LEFT', 'GL_FRONT')
-            self.replaceState(parameters, 'GL_READ_BUFFER', 'GL_FRONT_LEFT', 'GL_FRONT')
-
     def adjustRefState(self, state):
         # Do some adjustments on reference state to eliminate failures from
         # bugs/issues outside of apitrace
@@ -419,7 +414,8 @@ class AppDriver(Driver):
 
     def _retrace(self, args = None, stdout=subprocess.PIPE):
         retrace = self.api_retrace_map[self.api]
-        cmd = [get_build_program(retrace)]
+        #cmd = [get_build_program(retrace)]
+        cmd = [options.apitrace, 'retrace']
         if self.doubleBuffer:
             cmd += ['-db']
         else: