glxtrace: Basic EXT_texture_from_pixmap support.

Make EXT_texture_from_pixmap traces replayable, by emitting a fake
glTexImage2D calls on glXBindTexImageEXT calls.

diff --git a/wrappers/egltrace.py b/wrappers/egltrace.py
index 8c4a46a0b9b3c5abde49ff91a936d4138f995285..2d9af1babfe231eb65f4ae61f56ec113cb622fba 100644 (file)
--- a/wrappers/egltrace.py
+++ b/wrappers/egltrace.py
@@ -96,18 +96,6 @@ class EglTracer(GlTracer):
             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>'

diff --git a/wrappers/gltrace.py b/wrappers/gltrace.py
index c40fbb36de62aaac143a13ab1acf9b4e894f659f..cf84ac56a4c05212ac2d4a7486c89c88152c3460 100644 (file)
--- a/wrappers/gltrace.py
+++ b/wrappers/gltrace.py
@@ -1059,6 +1059,16 @@ class GlTracer(Tracer):
         function = api.getFunctionByName('glClientActiveTexture')
         self.fake_call(function, [texture])
 
+    def emitFakeTexture2D(self):
+        function = glapi.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();'
 
 
 

diff --git a/wrappers/glxtrace.py b/wrappers/glxtrace.py
index 8f83f313360c682215a8865eb44df121fadacc89..21bf8f144cea89f92f1588720a804da72aa1f748 100644 (file)
--- a/wrappers/glxtrace.py
+++ b/wrappers/glxtrace.py
@@ -80,6 +80,72 @@ class GlxTracer(GlTracer):
             print '            gltrace::clearContext();'
             print '    }'
 
+        if function.name == 'glXBindTexImageEXT':
+            # FIXME: glXBindTexImageEXT gets called frequently, so we should
+            # avoid recording the same data over and over again somehow, e.g.:
+            # - get the pixels before and after glXBindTexImageEXT, and only
+            #   emit emitFakeTexture2D when it changes
+            # - keep a global hash of the pixels
+            # FIXME: Handle mipmaps
+            print r'''
+                unsigned glx_target = 0;
+                _glXQueryDrawable(display, drawable, GLX_TEXTURE_TARGET_EXT, &glx_target);
+                GLenum target;
+                switch (glx_target) {
+                // FIXME
+                //case GLX_TEXTURE_1D_EXT:
+                //    target = GL_TEXTURE_1D;
+                //    break;
+                case GLX_TEXTURE_2D_EXT:
+                    target = GL_TEXTURE_2D;
+                    break;
+                case GLX_TEXTURE_RECTANGLE_EXT:
+                    target = GL_TEXTURE_RECTANGLE;
+                    break;
+                default:
+                    os::log("apitrace: warning: %s: unsupported GLX_TEXTURE_TARGET_EXT 0x%u\n", __FUNCTION__, glx_target);
+                    target = GL_NONE;
+                    break;
+                }
+                GLint level = 0;
+                GLint internalformat = GL_NONE;
+                _glGetTexLevelParameteriv(target, level, GL_TEXTURE_INTERNAL_FORMAT, &internalformat);
+                GLint width = 0;
+                _glGetTexLevelParameteriv(target, level, GL_TEXTURE_WIDTH, &width);
+                GLint height = 0;
+                _glGetTexLevelParameteriv(target, level, GL_TEXTURE_HEIGHT, &height);
+                GLint border = 0;
+                unsigned glx_format = 0;
+                _glXQueryDrawable(display, drawable, GLX_TEXTURE_FORMAT_EXT, &glx_format);
+                GLenum format;
+                switch (glx_format) {
+                case GLX_TEXTURE_FORMAT_RGB_EXT:
+                    format = GL_RGB;
+                    break;
+                case GLX_TEXTURE_FORMAT_RGBA_EXT:
+                    format = GL_RGBA;
+                    break;
+                case GLX_TEXTURE_FORMAT_NONE_EXT:
+                    // XXX: This really shouldn't happen but some
+                    // implementations (Mesa) appear return bogus results to
+                    // the GLX_TEXTURE_FORMAT_EXT query
+                default:
+                    //os::log("apitrace: warning: %s: unexpected GLX_TEXTURE_FORMAT_EXT 0x%u\n", __FUNCTION__, glx_format);
+                    format = GL_RGBA;
+                    break;
+                }
+                GLenum type = GL_UNSIGNED_BYTE;
+                if (target && internalformat && height && width && format) {
+                    GLint channels = _gl_format_channels(format);
+                    GLvoid * pixels = malloc(height * width * channels);
+                    _glGetTexImage(target, level, format, type, pixels);
+            '''
+            self.emitFakeTexture2D()
+            print r'''
+                    free(pixels);
+                }
+            '''
+
 
 if __name__ == '__main__':
     print