X-Git-Url: https://git.cworth.org/git?p=apitrace-tests;a=blobdiff_plain;f=app_driver.py;h=0e6cc37c65c5f68ab82b82b4e16cc70f358ebe6e;hp=3589fd009f8548d1b2b0698396dee038b7840bc8;hb=8351c1e187d8f65477db05a07bacd5d184c2b950;hpb=91c6216aa7b98e35f5f30c703630e68a69b5251e

diff --git a/app_driver.py b/app_driver.py
index 3589fd0..0e6cc37 100755
--- a/app_driver.py
+++ b/app_driver.py
@@ -117,7 +117,7 @@ class AppDriver(Driver):
         'egl_gl': 'eglretrace',
         'egl_gles1': 'eglretrace',
         'egl_gles2': 'eglretrace',
-        #'d3d8': 'd3dretrace',
+        'd3d8': 'd3dretrace',
         'd3d9': 'd3dretrace',
         'd3d10': 'd3dretrace',
         'd3d10_1': 'd3dretrace',
@@ -152,8 +152,9 @@ class AppDriver(Driver):
         
         cmd = [
             options.apitrace, 'trace', 
-            '--api', self.api_trace_map[self.api],
-            '--output', self.trace_file,
+            '-v',
+            '-a', self.api_trace_map[self.api],
+            '-o', self.trace_file,
             '--'
         ] + cmd
         if self.max_frames is not None:
@@ -173,8 +174,8 @@ class AppDriver(Driver):
     def checkTrace(self):
         sys.stderr.write('Comparing trace %s against %s...\n' % (self.trace_file, self.ref_dump))
 
-        cmd = [options.apitrace, 'dump', '--color=never', self.trace_file]
-        p = popen(cmd, stdout=subprocess.PIPE)
+        cmd = [options.apitrace, 'dump', '--verbose', '--color=never', self.trace_file]
+        p = popen(cmd, stdout=subprocess.PIPE, universal_newlines=True)
 
         srcParser = SrcTraceParser(p.stdout)
         srcTrace = srcParser.parse()
@@ -316,14 +317,13 @@ class AppDriver(Driver):
         from PIL import Image
         state = self.getState(callNo)
         if self.doubleBuffer:
-            attachments = ['GL_BACK', 'GL_BACK_LEFT', 'GL_BACK_RIGHT', 'GL_COLOR_ATTACHMENT0']
+            attachments = ['GL_BACK', 'GL_BACK_LEFT', 'GL_BACK_RIGHT', 'GL_COLOR_ATTACHMENT0', 'RENDER_TARGET_0']
         else:
-            attachments = ['GL_FRONT', 'GL_FRONT_LEFT', 'GL_FRONT_RIGHT', 'GL_COLOR_ATTACHMENT0']
+            attachments = ['GL_FRONT', 'GL_FRONT_LEFT', 'GL_FRONT_RIGHT', 'GL_COLOR_ATTACHMENT0', 'RENDER_TARGET_0']
         imageObj = self.getFramebufferAttachment(state, attachments)
         data = imageObj['__data__']
         stream = StringIO(base64.b64decode(data))
         im = Image.open(stream)
-        im.save('test.png')
         return im
 
     def getFramebufferAttachment(self, state, attachments):