Merge branch 'egl-image'

Conflicts:
	wrappers/egltrace.py

diff --cc wrappers/egltrace.py
index 433058158686ad79e80eaf700b421b63db610069,c5ead2d52598ea31f16e97389d0f9d6ab1f9b3a9..a6ff17f8eaa1f37509b6ad094f07e8e2306f02d4
--- 1/wrappers/egltrace.py
--- 2/wrappers/egltrace.py
+++ b/wrappers/egltrace.py
@@@ -81,7 -81,35 +81,34 @@@ class EglTracer(GlTracer)
              print '        gltrace::releaseContext((uintptr_t)ctx);'
              print '    }'
  
+         if function.name == 'glEGLImageTargetTexture2DOES':
+             print '    image_info *info = _EGLImageKHR_get_image_info(target, image);'
+             print '    if (info) {'
+             print '        GLint level = 0;'
+             print '        GLint internalformat = info->internalformat;'
+             print '        GLsizei width = info->width;'
+             print '        GLsizei height = info->height;'
+             print '        GLint border = 0;'
+             print '        GLenum format = info->format;'
+             print '        GLenum type = info->type;'
+             print '        const GLvoid * pixels = info->pixels;'
+             self.emitFakeTexture2D()
+             print '        _EGLImageKHR_free_image_info(info);'
+             print '    }'
+ 
+     def emitFakeTexture2D(self):
+         function = glapi.getFunctionByName('glTexImage2D')
+         instances = function.argNames()
+         print '        unsigned _fake_call = trace::localWriter.beginEnter(&_%s_sig);' % (function.name,)
+         for arg in function.args:
+             assert not arg.output
+             self.serializeArg(function, arg)
+         print '        trace::localWriter.endEnter();'
+         print '        trace::localWriter.beginLeave(_fake_call);'
+         print '        trace::localWriter.endLeave();'
+ 
+ 
  
 -
  if __name__ == '__main__':
      print '#include <stdlib.h>'
      print '#include <string.h>'