From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Fri, 30 Mar 2012 19:41:25 +0000 (+0100)
Subject: Merge branch 'master' into d3dretrace
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=12a22803faa06a0db229b6dfb6130a0e8156ba31;p=apitrace

Merge branch 'master' into d3dretrace

Conflicts:
	retrace.py
---

12a22803faa06a0db229b6dfb6130a0e8156ba31
diff --cc retrace.py
index 15cdaf5,1203a09..d6e8387
--- a/retrace.py
+++ b/retrace.py
@@@ -218,30 -212,8 +218,32 @@@ class Retracer
              print '    (void)call;'
              return
  
 +        self.deserializeArgs(function)
 +        
 +        self.invokeFunction(function)
 +
 +        self.swizzleValues(function)
 +
 +    def retraceInterfaceMethodBody(self, interface, method):
 +        if not method.sideeffects:
 +            print '    (void)call;'
 +            return
 +
 +        self.deserializeThisPointer(interface)
 +
 +        self.deserializeArgs(method)
 +        
 +        self.invokeInterfaceMethod(interface, method)
 +
 +        self.swizzleValues(method)
 +
 +    def deserializeThisPointer(self, interface):
 +        print '    %s *_this;' % (interface.name,)
 +        # FIXME
 +
 +    def deserializeArgs(self, function):
+         print '    retrace::ScopedAllocator _allocator;'
+         print '    (void)_allocator;'
          success = True
          for arg in function.args:
              arg_type = ConstRemover().visit(arg.type)