Merge branch 'master' into dxva

Conflicts:
	common/trace_parser_flags.cpp

diff --combined wrappers/CMakeLists.txt
index f65817d24a333cf671980fe72874bf1b36582912,bd2d2e82802fa385c6c639a230bc41c2a9427591..6fa615c5bc07e173db9a9f4bba63281c7c0b621b
--- 1/wrappers/CMakeLists.txt
--- 2/wrappers/CMakeLists.txt
+++ b/wrappers/CMakeLists.txt
@@@ -101,7 -101,6 +101,7 @@@ if (WIN32
                  ${CMAKE_SOURCE_DIR}/specs/d3d9.py
                  ${CMAKE_SOURCE_DIR}/specs/d3d9types.py
                  ${CMAKE_SOURCE_DIR}/specs/d3d9caps.py
 +                ${CMAKE_SOURCE_DIR}/specs/d3d9dxva2.py
                  ${CMAKE_SOURCE_DIR}/specs/winapi.py
                  ${CMAKE_SOURCE_DIR}/specs/stdapi.py
          )
@@@ -127,6 -126,7 +127,7 @@@
              COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d10trace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d10trace.cpp
              DEPENDS
                  d3d10trace.py
+                 d3dcommontrace.py
                  dlltrace.py
                  trace.py
                  ${CMAKE_SOURCE_DIR}/dispatch/dispatch.py
@@@ -164,6 -164,7 +165,7 @@@
              COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d10_1trace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d10_1trace.cpp
              DEPENDS
                  d3d10_1trace.py
+                 d3dcommontrace.py
                  dlltrace.py
                  trace.py
                  ${CMAKE_SOURCE_DIR}/dispatch/dispatch.py
@@@ -177,7 -178,7 +179,7 @@@
                  ${CMAKE_SOURCE_DIR}/specs/winapi.py
                  ${CMAKE_SOURCE_DIR}/specs/stdapi.py
          )
-         add_library (d3d10_1trace MODULE d3d10_1.def d3d10_1trace.cpp)
+         add_library (d3d10_1trace MODULE d3d10_1.def d3d10_1trace.cpp d3d10shader.cpp)
          target_link_libraries (d3d10_1trace
              common_trace
              common
@@@ -347,7 -348,6 +349,6 @@@ elseif (X11_FOUND
          common
          ${ZLIB_LIBRARIES}
          ${SNAPPY_LIBRARIES}
-         ${X11_X11_LIB}
          ${CMAKE_THREAD_LIBS_INIT}
          dl
      )
@@@ -377,6 -377,7 +378,7 @@@ if (ENABLE_EGL AND NOT WIN32 AND NOT AP
          egltrace.cpp
          glcaps.cpp
          gltrace_state.cpp
+         ${CMAKE_SOURCE_DIR}/helpers/eglsize.cpp
      )
  
      add_dependencies (egltrace glproc)

diff --combined wrappers/d3d9trace.py
index 17ebe197d872a17b5dcf779dbcc0b123676861af,df39927f787a7854a233eb4689d9e39698aca4b7..33f6e9d9dfbfa18b5fae730d31fb0552803925b6
--- 1/wrappers/d3d9trace.py
--- 2/wrappers/d3d9trace.py
+++ b/wrappers/d3d9trace.py
@@@ -27,8 -27,6 +27,8 @@@
  from dlltrace import DllTracer
  from specs.d3d9 import d3d9, D3DSHADER9
  
 +import specs.d3d9dxva2
 +
  
  class D3D9Tracer(DllTracer):
  
@@@ -43,6 -41,7 +43,7 @@@
      def enumWrapperInterfaceVariables(self, interface):
          variables = DllTracer.enumWrapperInterfaceVariables(self, interface)
          
+         # Add additional members to track locks
          if interface.getMethodByName('Lock') is not None or \
             interface.getMethodByName('LockRect') is not None or \
             interface.getMethodByName('LockBox') is not None:
@@@ -54,12 -53,6 +55,12 @@@
          return variables
  
      def implementWrapperInterfaceMethodBody(self, interface, base, method):
 +        if method.name == 'DecodeExecute':
 +            print r'    _NumCompBuffers = pExecuteParams->NumCompBuffers;'
 +
 +        if method.name == 'VideoProcessBlt':
 +            print r'    _NumSrcSurfaces = pData->NumSrcSurfaces;'
 +
          if method.name in ('Unlock', 'UnlockRect', 'UnlockBox'):
              print '    if (_LockedSize && m_pbData) {'
              self.emit_memcpy('(LPBYTE)m_pbData', '(LPBYTE)m_pbData', '_LockedSize')
@@@ -84,9 -77,8 +85,9 @@@ if __name__ == '__main__'
      print '#include "os.hpp"'
      print
      print '#include "d3d9imports.hpp"'
-     print '#include "d3dsize.hpp"'
+     print '#include "d3d9size.hpp"'
      print '#include "d3d9shader.hpp"'
 +    print '#include "dxvaint.h"'
      print
      print '''
  static inline size_t
@@@ -98,9 -90,6 +99,9 @@@ _declCount(const D3DVERTEXELEMENT9 *pVe
      }
      return count;
  }
 +
 +static UINT _NumCompBuffers = 0; /* XXX */
 +static UINT _NumSrcSurfaces = 0; /* XXX */
  '''
      tracer = D3D9Tracer('d3d9.dll')
      tracer.traceApi(d3d9)