From 468c9775cbc863b024f41fccad3d6bb967e10ea8 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Thu, 14 Aug 2008 11:00:22 +0100
Subject: python/retrace: Application capable of replaying gallium traces.

At the moment it is capable of replaying trivial/tri kind of apps.

See README for status.
---
 .../state_trackers/python/retrace/interpreter.py   | 418 +++++++++++++++++++++
 1 file changed, 418 insertions(+)
 create mode 100755 src/gallium/state_trackers/python/retrace/interpreter.py

(limited to 'src/gallium/state_trackers/python/retrace/interpreter.py')

diff --git a/src/gallium/state_trackers/python/retrace/interpreter.py b/src/gallium/state_trackers/python/retrace/interpreter.py
new file mode 100755
index 0000000000..ae62bc04a8
--- /dev/null
+++ b/src/gallium/state_trackers/python/retrace/interpreter.py
@@ -0,0 +1,418 @@
+#!/usr/bin/env python
+#############################################################################
+#
+# Copyright 2008 Tungsten Graphics, Inc.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+#############################################################################
+
+
+import sys
+import gallium
+import model
+from parser import TraceParser
+
+
+def make_image(surface):
+    pixels = gallium.FloatArray(surface.height*surface.width*4)
+    surface.get_tile_rgba(0, 0, surface.width, surface.height, pixels)
+
+    import Image
+    outimage = Image.new(
+        mode='RGB',
+        size=(surface.width, surface.height),
+        color=(0,0,0))
+    outpixels = outimage.load()
+    for y in range(0, surface.height):
+        for x in range(0, surface.width):
+            offset = (y*surface.width + x)*4
+            r, g, b, a = [int(pixels[offset + ch]*255) for ch in range(4)]
+            outpixels[x, y] = r, g, b
+    return outimage
+
+def save_image(filename, surface):
+    outimage = make_image(surface)
+    outimage.save(filename, "PNG")
+
+def show_image(surface):
+    outimage = make_image(surface)
+    
+    import Tkinter as tk
+    from PIL import Image, ImageTk
+    root = tk.Tk()
+    
+    root.title('background image')
+    
+    image1 = ImageTk.PhotoImage(outimage)
+    w = image1.width()
+    h = image1.height()
+    x = 100
+    y = 100
+    root.geometry("%dx%d+%d+%d" % (w, h, x, y))
+    panel1 = tk.Label(root, image=image1)
+    panel1.pack(side='top', fill='both', expand='yes')
+    panel1.image = image1
+    root.mainloop()
+
+
+
+
+class Struct:
+    """C-like struct"""
+
+    # A basic Python class can pass as a C-like structure
+    pass
+
+
+struct_factories = {
+    "pipe_blend_color": gallium.BlendColor,
+    "pipe_blend_state": gallium.Blend,
+    "pipe_clip_state": gallium.Clip,
+    #"pipe_constant_buffer": gallium.ConstantBuffer,
+    "pipe_depth_state": gallium.Depth,
+    "pipe_stencil_state": gallium.Stencil,
+    "pipe_alpha_state": gallium.Alpha,
+    "pipe_depth_stencil_alpha_state": gallium.DepthStencilAlpha,
+    "pipe_format_block": gallium.FormatBlock,
+    #"pipe_framebuffer_state": gallium.Framebuffer,
+    "pipe_poly_stipple": gallium.PolyStipple,
+    "pipe_rasterizer_state": gallium.Rasterizer,
+    "pipe_sampler_state": gallium.Sampler,
+    "pipe_scissor_state": gallium.Scissor,
+    #"pipe_shader_state": gallium.Shader,
+    #"pipe_vertex_buffer": gallium.VertexBuffer,
+    "pipe_vertex_element": gallium.VertexElement,
+    "pipe_viewport_state": gallium.Viewport,
+    #"pipe_texture": gallium.Texture,
+}
+
+
+member_array_factories = {
+    "pipe_rasterizer_state": {"sprite_coord_mode": gallium.ByteArray},                          
+    "pipe_poly_stipple": {"stipple": gallium.UnsignedArray},                          
+    "pipe_viewport_state": {"scale": gallium.FloatArray, "translate": gallium.FloatArray},                          
+    "pipe_clip_state": {"ucp": gallium.FloatArray},
+    "pipe_depth_stencil_alpha_state": {"stencil": gallium.StencilArray},
+    "pipe_blend_color": {"color": gallium.FloatArray},                         
+}
+
+
+class Translator(model.Visitor):
+    """Translate model arguments into regular Python objects"""
+
+    def __init__(self, interpreter):
+        self.interpreter = interpreter
+        self.result = None
+
+    def visit(self, node):
+        self.result = None
+        node.visit(self)
+        return self.result
+        
+    def visit_literal(self, node):
+        self.result = node.value
+    
+    def visit_named_constant(self, node):
+        # lookup the named constant in the gallium module
+        self.result = getattr(gallium, node.name)
+    
+    def visit_array(self, node):
+        array = []
+        for element in node.elements:
+            array.append(self.visit(element))
+        self.result = array
+    
+    def visit_struct(self, node):
+        struct_factory = struct_factories.get(node.name, Struct)
+        struct = struct_factory()
+        for member_name, member_node in node.members:
+            member_value = self.visit(member_node)
+            try:
+                array_factory = member_array_factories[node.name][member_name]
+            except KeyError:
+                pass
+            else:
+                assert isinstance(member_value, list)
+                array = array_factory(len(member_value))
+                for i in range(len(member_value)):
+                    array[i] = member_value[i]
+                member_value = array
+            #print node.name, member_name, member_value
+            assert isinstance(struct, Struct) or hasattr(struct, member_name)
+            setattr(struct, member_name, member_value)
+        self.result = struct
+    
+    def visit_pointer(self, node):
+        self.result = self.interpreter.lookup_object(node.address)
+
+
+class Object:
+    
+    def __init__(self, interpreter, real):
+        self.interpreter = interpreter
+        self.real = real
+        
+
+class Global(Object):
+
+    def __init__(self, interpreter, real):
+        self.interpreter = interpreter
+        self.real = real
+        
+    def pipe_winsys_create(self):
+        return Winsys(self.interpreter, gallium.Device())
+
+    def pipe_screen_create(self, winsys):
+        return Screen(self.interpreter, winsys.real)
+    
+    def pipe_context_create(self, screen):
+        context = screen.real.context_create()
+        return Context(self.interpreter, context)
+
+    
+class Winsys(Object):
+    
+    def __init__(self, interpreter, real):
+        self.interpreter = interpreter
+        self.real = real
+
+    def get_name(self):
+        pass
+    
+    def buffer_create(self, alignment, usage, size):
+        return self.real.buffer_create(size, alignment, usage)
+    
+    def buffer_destroy(self, buffer):
+        pass
+    
+    def buffer_write(self, buffer, data, size):
+        buffer.write(data, size)
+        buffer.write(data, size)
+
+
+class Screen(Object):
+    
+    def get_name(self):
+        pass
+    
+    def get_vendor(self):
+        pass
+    
+    def get_param(self, param):
+        pass
+    
+    def get_paramf(self, param):
+        pass
+    
+    def is_format_supported(self, format, target, tex_usage, geom_flags):
+        return self.real.is_format_supported(format, target, tex_usage, geom_flags)
+    
+    def texture_create(self, template):
+        return self.real.texture_create(
+            format = template.format,
+            width = template.width[0],
+            height = template.height[0],
+            depth = template.depth[0],
+            last_level = template.last_level,
+            target = template.target,
+            tex_usage = template.tex_usage,
+        )
+
+    def texture_release(self, texture):
+        self.interpreter.unregister_object(texture)
+
+    def get_tex_surface(self, texture, face, level, zslice, usage):
+        return texture.get_surface(face, level, zslice, usage)
+    
+    def tex_surface_release(self, surface):
+        self.interpreter.unregister_object(surface)
+
+    def surface_map(self, surface, flags):
+        return None
+    
+    def surface_unmap(self, surface):
+        pass
+
+
+class Context(Object):
+    
+    def __init__(self, interpreter, real):
+        Object.__init__(self, interpreter, real)
+        self.cbufs = []
+        self.zsbuf = None
+
+    def create_blend_state(self, state):
+        return state
+
+    def bind_blend_state(self, state):
+        self.real.set_blend(state)
+        
+    def create_sampler_state(self, state):
+        return state
+
+    def bind_sampler_states(self, n, states):
+        for i in range(n):
+            self.real.set_sampler(i, states[i])
+        
+    def create_rasterizer_state(self, state):
+        return state
+
+    def bind_rasterizer_state(self, state):
+        self.real.set_rasterizer(state)
+        
+    def create_depth_stencil_alpha_state(self, state):
+        return state
+
+    def bind_depth_stencil_alpha_state(self, state):
+        self.real.set_depth_stencil_alpha(state)
+    
+    def create_fs_state(self, state):
+        tokens = str(state.tokens)
+        shader = gallium.Shader(tokens)
+        return shader
+
+    create_vs_state = create_fs_state
+    
+    def bind_fs_state(self, state):
+        self.real.set_fragment_shader(state)
+        
+    def bind_vs_state(self, state):
+        self.real.set_vertex_shader(state)
+
+    def set_blend_color(self, state):
+        self.real.set_blend_color(state)
+
+    def set_clip_state(self, state):
+        self.real.set_clip(state)
+
+    def set_constant_buffer(self, shader, index, state):
+        self.real.set_constant_buffer(shader, index, state.buffer)
+
+    def set_framebuffer_state(self, state):
+        _state = gallium.Framebuffer()
+        _state.width = state.width
+        _state.height = state.height
+        _state.num_cbufs = state.num_cbufs
+        for i in range(len(state.cbufs)):
+            _state.set_cbuf(i, state.cbufs[i])
+        _state.set_zsbuf(state.zsbuf)    
+        self.real.set_framebuffer(_state)
+        
+        self.cbufs = state.cbufs
+        self.zsbuf = state.zsbuf
+
+    def set_polygon_stipple(self, state):
+        self.real.set_polygon_stipple(state)
+
+    def set_scissor_state(self, state):
+        self.real.set_scissor(state)
+
+    def set_viewport_state(self, state):
+        self.real.set_viewport(state)
+
+    def set_sampler_textures(self, n, textures):
+        for i in range(n):
+            self.real.set_sampler_textures(textures[i])
+
+    def set_vertex_buffers(self, n, vbufs):
+        for i in range(n):
+            vbuf = vbufs[i]
+            self.real.set_vertex_buffer(
+                i,
+                pitch = vbuf.pitch,
+                max_index = vbuf.max_index,
+                buffer_offset = vbuf.buffer_offset,
+                buffer = vbuf.buffer,
+            )
+
+    def set_vertex_elements(self, n, elements):
+        for i in range(n):
+            self.real.set_vertex_element(i, elements[i])
+        self.real.set_vertex_elements(n)
+
+    def set_edgeflags(self, bitfield):
+        # FIXME
+        pass
+    
+    def draw_arrays(self, mode, start, count):
+        self.real.draw_arrays(mode, start, count)
+        self._update()
+        
+    def flush(self, flags, fence):
+        self.real.flush(flags)
+
+    def clear(self, surface, value):
+        self.real.surface_clear(surface, value)
+        
+    def _update(self):
+        self.real.flush()
+    
+        if self.cbufs and self.cbufs[0]:
+            show_image(self.cbufs[0])
+    
+
+class Interpreter:
+    
+    def __init__(self):
+        self.objects = {}
+        self.result = None
+        self.globl = Global(self, None)
+
+    def register_object(self, address, object):
+        self.objects[address] = object
+        
+    def unregister_object(self, object):
+        # FIXME:
+        pass
+
+    def lookup_object(self, address):
+        return self.objects[address]
+    
+    def interpret(self, trace):
+        for call in trace.calls:
+            self.interpret_call(call)
+
+    def interpret_call(self, call):
+        sys.stderr.write("%s\n" % call)
+        
+        args = [self.interpret_arg(arg) for name, arg in call.args] 
+        
+        if call.klass:
+            obj = args[0]
+            args = args[1:]
+        else:
+            obj = self.globl
+            
+        method = getattr(obj, call.method)
+        ret = method(*args)
+        
+        if call.ret and isinstance(call.ret, model.Pointer):
+            self.register_object(call.ret.address, ret)
+
+    def interpret_arg(self, node):
+        translator = Translator(self)
+        return translator.visit(node)
+    
+
+def main():
+    for arg in sys.argv[1:]:
+        parser = TraceParser(open(arg, 'rt'))
+        trace = parser.parse()
+        interpreter = Interpreter()
+        interpreter.interpret(trace)
+
+
+if __name__ == '__main__':
+    main()
-- 
cgit v1.2.3


From c9751522b0ee1908c79f3f9d37b508ac0680bd16 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Thu, 14 Aug 2008 22:03:35 +0100
Subject: pyhon/retrace: Retrace surface contents.

Now capable of replaying trivial/quad-tex-2d
---
 .../state_trackers/python/retrace/interpreter.py   | 35 ++++++++++++++++------
 1 file changed, 26 insertions(+), 9 deletions(-)

(limited to 'src/gallium/state_trackers/python/retrace/interpreter.py')

diff --git a/src/gallium/state_trackers/python/retrace/interpreter.py b/src/gallium/state_trackers/python/retrace/interpreter.py
index ae62bc04a8..00b6376623 100755
--- a/src/gallium/state_trackers/python/retrace/interpreter.py
+++ b/src/gallium/state_trackers/python/retrace/interpreter.py
@@ -105,7 +105,8 @@ member_array_factories = {
     "pipe_viewport_state": {"scale": gallium.FloatArray, "translate": gallium.FloatArray},                          
     "pipe_clip_state": {"ucp": gallium.FloatArray},
     "pipe_depth_stencil_alpha_state": {"stencil": gallium.StencilArray},
-    "pipe_blend_color": {"color": gallium.FloatArray},                         
+    "pipe_blend_color": {"color": gallium.FloatArray},
+    "pipe_sampler_state": {"border_color": gallium.FloatArray},              
 }
 
 
@@ -191,6 +192,15 @@ class Winsys(Object):
     def get_name(self):
         pass
     
+    def user_buffer_create(self, data, size):
+        # We don't really care to distinguish between user and regular buffers
+        buffer = self.real.buffer_create(size, 
+                                         4, 
+                                         gallium.PIPE_BUFFER_USAGE_CPU_READ |
+                                         gallium.PIPE_BUFFER_USAGE_CPU_WRITE )
+        buffer.write(data, size)
+        return buffer
+    
     def buffer_create(self, alignment, usage, size):
         return self.real.buffer_create(size, alignment, usage)
     
@@ -199,7 +209,15 @@ class Winsys(Object):
     
     def buffer_write(self, buffer, data, size):
         buffer.write(data, size)
-        buffer.write(data, size)
+        
+    def fence_finish(self, fence, flags):
+        pass
+    
+    def fence_reference(self, dst, src):
+        pass
+    
+    def flush_frontbuffer(self, surface):
+        pass
 
 
 class Screen(Object):
@@ -239,11 +257,9 @@ class Screen(Object):
     def tex_surface_release(self, surface):
         self.interpreter.unregister_object(surface)
 
-    def surface_map(self, surface, flags):
-        return None
-    
-    def surface_unmap(self, surface):
-        pass
+    def surface_write(self, surface, data, stride, size):
+        assert surface.nblocksy * stride == size 
+        surface.put_tile_raw(0, 0, surface.width, surface.height, data, stride)
 
 
 class Context(Object):
@@ -324,7 +340,7 @@ class Context(Object):
 
     def set_sampler_textures(self, n, textures):
         for i in range(n):
-            self.real.set_sampler_textures(textures[i])
+            self.real.set_sampler_texture(i, textures[i])
 
     def set_vertex_buffers(self, n, vbufs):
         for i in range(n):
@@ -350,8 +366,9 @@ class Context(Object):
         self.real.draw_arrays(mode, start, count)
         self._update()
         
-    def flush(self, flags, fence):
+    def flush(self, flags):
         self.real.flush(flags)
+        return None
 
     def clear(self, surface, value):
         self.real.surface_clear(surface, value)
-- 
cgit v1.2.3


From 52ecb8f56368180b5dec303d1d77a8d0596aaef7 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Fri, 15 Aug 2008 10:33:35 +0100
Subject: python/retrace: Update frame when PIPE_FLUSH_FRAME spotted.

---
 src/gallium/state_trackers/python/retrace/interpreter.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/gallium/state_trackers/python/retrace/interpreter.py')

diff --git a/src/gallium/state_trackers/python/retrace/interpreter.py b/src/gallium/state_trackers/python/retrace/interpreter.py
index 00b6376623..fa9a65365c 100755
--- a/src/gallium/state_trackers/python/retrace/interpreter.py
+++ b/src/gallium/state_trackers/python/retrace/interpreter.py
@@ -364,10 +364,11 @@ class Context(Object):
     
     def draw_arrays(self, mode, start, count):
         self.real.draw_arrays(mode, start, count)
-        self._update()
         
     def flush(self, flags):
         self.real.flush(flags)
+        if flags & gallium.PIPE_FLUSH_FRAME:
+            self._update()
         return None
 
     def clear(self, surface, value):
-- 
cgit v1.2.3


From d7f8b95e097121a8c33332f920115795853d6ad7 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Tue, 19 Aug 2008 19:12:22 +0100
Subject: python/retrace: Add several missing functions.

---
 .../state_trackers/python/retrace/interpreter.py   | 57 ++++++++++++++++++----
 1 file changed, 48 insertions(+), 9 deletions(-)

(limited to 'src/gallium/state_trackers/python/retrace/interpreter.py')

diff --git a/src/gallium/state_trackers/python/retrace/interpreter.py b/src/gallium/state_trackers/python/retrace/interpreter.py
index fa9a65365c..a7a7341e06 100755
--- a/src/gallium/state_trackers/python/retrace/interpreter.py
+++ b/src/gallium/state_trackers/python/retrace/interpreter.py
@@ -79,7 +79,7 @@ class Struct:
 struct_factories = {
     "pipe_blend_color": gallium.BlendColor,
     "pipe_blend_state": gallium.Blend,
-    "pipe_clip_state": gallium.Clip,
+    #"pipe_clip_state": gallium.Clip,
     #"pipe_constant_buffer": gallium.ConstantBuffer,
     "pipe_depth_state": gallium.Depth,
     "pipe_stencil_state": gallium.Stencil,
@@ -103,7 +103,7 @@ member_array_factories = {
     "pipe_rasterizer_state": {"sprite_coord_mode": gallium.ByteArray},                          
     "pipe_poly_stipple": {"stipple": gallium.UnsignedArray},                          
     "pipe_viewport_state": {"scale": gallium.FloatArray, "translate": gallium.FloatArray},                          
-    "pipe_clip_state": {"ucp": gallium.FloatArray},
+    #"pipe_clip_state": {"ucp": gallium.FloatArray},
     "pipe_depth_stencil_alpha_state": {"stencil": gallium.StencilArray},
     "pipe_blend_color": {"color": gallium.FloatArray},
     "pipe_sampler_state": {"border_color": gallium.FloatArray},              
@@ -219,6 +219,12 @@ class Winsys(Object):
     def flush_frontbuffer(self, surface):
         pass
 
+    def surface_alloc(self):
+        return None
+    
+    def surface_release(self, surface):
+        pass
+
 
 class Screen(Object):
     
@@ -269,15 +275,25 @@ class Context(Object):
         self.cbufs = []
         self.zsbuf = None
 
+    def destroy(self):
+        pass
+    
     def create_blend_state(self, state):
         return state
 
     def bind_blend_state(self, state):
-        self.real.set_blend(state)
-        
+        if state is not None:
+            self.real.set_blend(state)
+
+    def delete_blend_state(self, state):
+        pass
+    
     def create_sampler_state(self, state):
         return state
 
+    def delete_sampler_state(self, state):
+        pass
+
     def bind_sampler_states(self, n, states):
         for i in range(n):
             self.real.set_sampler(i, states[i])
@@ -286,14 +302,22 @@ class Context(Object):
         return state
 
     def bind_rasterizer_state(self, state):
-        self.real.set_rasterizer(state)
+        if state is not None:
+            self.real.set_rasterizer(state)
         
+    def delete_rasterizer_state(self, state):
+        pass
+    
     def create_depth_stencil_alpha_state(self, state):
         return state
 
     def bind_depth_stencil_alpha_state(self, state):
-        self.real.set_depth_stencil_alpha(state)
-    
+        if state is not None:
+            self.real.set_depth_stencil_alpha(state)
+            
+    def delete_depth_stencil_alpha_state(self, state):
+        pass
+
     def create_fs_state(self, state):
         tokens = str(state.tokens)
         shader = gallium.Shader(tokens)
@@ -307,14 +331,29 @@ class Context(Object):
     def bind_vs_state(self, state):
         self.real.set_vertex_shader(state)
 
+    def delete_fs_state(self, state):
+        pass
+    
+    delete_vs_state = delete_fs_state
+    
     def set_blend_color(self, state):
         self.real.set_blend_color(state)
 
     def set_clip_state(self, state):
-        self.real.set_clip(state)
+        _state = gallium.Clip()
+        _state.nr = state.nr
+        if state.nr:
+            # FIXME
+            ucp = gallium.FloatArray(gallium.PIPE_MAX_CLIP_PLANES*4)
+            for i in range(len(state.ucp)):
+                for j in range(len(state.ucp[i])):
+                    ucp[i*4 + j] = state.ucp[i][j]
+            _state.ucp = ucp
+        self.real.set_clip(_state)
 
     def set_constant_buffer(self, shader, index, state):
-        self.real.set_constant_buffer(shader, index, state.buffer)
+        if state is not None:
+            self.real.set_constant_buffer(shader, index, state.buffer)
 
     def set_framebuffer_state(self, state):
         _state = gallium.Framebuffer()
-- 
cgit v1.2.3


From 34cffce33413fe7701975d0d4bd54207bc44cacc Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Wed, 20 Aug 2008 14:03:12 +0100
Subject: python/retrace: Retrace draw_elements and draw_range_elements.

---
 src/gallium/state_trackers/python/retrace/interpreter.py | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/gallium/state_trackers/python/retrace/interpreter.py')

diff --git a/src/gallium/state_trackers/python/retrace/interpreter.py b/src/gallium/state_trackers/python/retrace/interpreter.py
index a7a7341e06..7502c096b6 100755
--- a/src/gallium/state_trackers/python/retrace/interpreter.py
+++ b/src/gallium/state_trackers/python/retrace/interpreter.py
@@ -403,6 +403,12 @@ class Context(Object):
     
     def draw_arrays(self, mode, start, count):
         self.real.draw_arrays(mode, start, count)
+    
+    def draw_elements(self, indexBuffer, indexSize, mode, start, count):
+        self.real.draw_elements(indexBuffer, indexSize, mode, start, count)
+        
+    def draw_range_elements(self, indexBuffer, indexSize, minIndex, maxIndex, mode, start, count):
+        self.real.draw_range_elements(indexBuffer, indexSize, minIndex, maxIndex, mode, start, count)
         
     def flush(self, flags):
         self.real.flush(flags)
-- 
cgit v1.2.3


From 10624065b0dc631164d786b2c39f35655e55eadf Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Thu, 21 Aug 2008 18:45:43 +0100
Subject: python/retrace: Support gziped traces.

---
 src/gallium/state_trackers/python/retrace/interpreter.py |  7 ++++++-
 src/gallium/state_trackers/python/retrace/parser.py      | 10 ++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'src/gallium/state_trackers/python/retrace/interpreter.py')

diff --git a/src/gallium/state_trackers/python/retrace/interpreter.py b/src/gallium/state_trackers/python/retrace/interpreter.py
index 7502c096b6..f596a54d10 100755
--- a/src/gallium/state_trackers/python/retrace/interpreter.py
+++ b/src/gallium/state_trackers/python/retrace/interpreter.py
@@ -471,7 +471,12 @@ class Interpreter:
 
 def main():
     for arg in sys.argv[1:]:
-        parser = TraceParser(open(arg, 'rt'))
+        if arg.endswith('.gz'):
+            import gzip
+            stream = gzip.GzipFile(arg, 'rt')
+        else:
+            stream = open(arg, 'rt')
+        parser = TraceParser(stream)
         trace = parser.parse()
         interpreter = Interpreter()
         interpreter.interpret(trace)
diff --git a/src/gallium/state_trackers/python/retrace/parser.py b/src/gallium/state_trackers/python/retrace/parser.py
index d02fd7f741..2ee4d3068d 100755
--- a/src/gallium/state_trackers/python/retrace/parser.py
+++ b/src/gallium/state_trackers/python/retrace/parser.py
@@ -322,9 +322,15 @@ class TraceParser(XmlParser):
 
 def main():
     for arg in sys.argv[1:]:
-        parser = TraceParser(open(arg, 'rt'))
+        if arg.endswith('.gz'):
+            import gzip
+            stream = gzip.GzipFile(arg, 'rt')
+        else:
+            stream = open(arg, 'rt')
+        parser = TraceParser(stream)
         trace = parser.parse()
-        print trace
+        for call in trace.calls:
+            print call
 
 
 if __name__ == '__main__':
-- 
cgit v1.2.3


From 7f3c3683ce50bad42411547d4b78e03d7f20e498 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Fri, 22 Aug 2008 01:23:48 +0100
Subject: python/retrace: Process the trace call-by-call (instead of reading
 everything into memory).

---
 .../state_trackers/python/retrace/interpreter.py   | 24 +++++---------------
 .../state_trackers/python/retrace/parser.py        | 26 ++++++++++++++--------
 2 files changed, 23 insertions(+), 27 deletions(-)

(limited to 'src/gallium/state_trackers/python/retrace/interpreter.py')

diff --git a/src/gallium/state_trackers/python/retrace/interpreter.py b/src/gallium/state_trackers/python/retrace/interpreter.py
index f596a54d10..a2f924f528 100755
--- a/src/gallium/state_trackers/python/retrace/interpreter.py
+++ b/src/gallium/state_trackers/python/retrace/interpreter.py
@@ -22,7 +22,7 @@
 import sys
 import gallium
 import model
-from parser import TraceParser
+import parser
 
 
 def make_image(surface):
@@ -426,9 +426,10 @@ class Context(Object):
             show_image(self.cbufs[0])
     
 
-class Interpreter:
+class Interpreter(parser.TraceParser):
     
-    def __init__(self):
+    def __init__(self, stream):
+        parser.TraceParser.__init__(self, stream)
         self.objects = {}
         self.result = None
         self.globl = Global(self, None)
@@ -447,7 +448,7 @@ class Interpreter:
         for call in trace.calls:
             self.interpret_call(call)
 
-    def interpret_call(self, call):
+    def handle_call(self, call):
         sys.stderr.write("%s\n" % call)
         
         args = [self.interpret_arg(arg) for name, arg in call.args] 
@@ -469,18 +470,5 @@ class Interpreter:
         return translator.visit(node)
     
 
-def main():
-    for arg in sys.argv[1:]:
-        if arg.endswith('.gz'):
-            import gzip
-            stream = gzip.GzipFile(arg, 'rt')
-        else:
-            stream = open(arg, 'rt')
-        parser = TraceParser(stream)
-        trace = parser.parse()
-        interpreter = Interpreter()
-        interpreter.interpret(trace)
-
-
 if __name__ == '__main__':
-    main()
+    parser.main(Interpreter)
diff --git a/src/gallium/state_trackers/python/retrace/parser.py b/src/gallium/state_trackers/python/retrace/parser.py
index 2ee4d3068d..6bc75ad685 100755
--- a/src/gallium/state_trackers/python/retrace/parser.py
+++ b/src/gallium/state_trackers/python/retrace/parser.py
@@ -183,12 +183,11 @@ class TraceParser(XmlParser):
 
     def parse(self):
         self.element_start('trace')
-        calls = []
         while self.token.type not in (ELEMENT_END, EOF):
-            calls.append(self.parse_call())
+            call = self.parse_call()
+            self.handle_call(call)
         if self.token.type != EOF:
             self.element_end('trace')
-        return Trace(calls)
 
     def parse_call(self):
         attrs = self.element_start('call')
@@ -319,19 +318,28 @@ class TraceParser(XmlParser):
 
         return Pointer(address)
 
+    def handle_call(self, call):
+        
+        pass
+    
+    
+class TraceDumper(TraceParser):
+    
+
+    def handle_call(self, call):
+        print call
+        
 
-def main():
+def main(ParserFactory):
     for arg in sys.argv[1:]:
         if arg.endswith('.gz'):
             import gzip
             stream = gzip.GzipFile(arg, 'rt')
         else:
             stream = open(arg, 'rt')
-        parser = TraceParser(stream)
-        trace = parser.parse()
-        for call in trace.calls:
-            print call
+        parser = ParserFactory(stream)
+        parser.parse()
 
 
 if __name__ == '__main__':
-    main()
+    main(TraceDumper)
-- 
cgit v1.2.3


From d32f51d4717686d626b0f7ec9a92c3c9af50009f Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Fri, 22 Aug 2008 03:14:51 +0100
Subject: python/retrace: Interpret texture/surfaces destructions.

---
 src/gallium/state_trackers/python/retrace/interpreter.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/gallium/state_trackers/python/retrace/interpreter.py')

diff --git a/src/gallium/state_trackers/python/retrace/interpreter.py b/src/gallium/state_trackers/python/retrace/interpreter.py
index a2f924f528..351a6e739b 100755
--- a/src/gallium/state_trackers/python/retrace/interpreter.py
+++ b/src/gallium/state_trackers/python/retrace/interpreter.py
@@ -254,15 +254,21 @@ class Screen(Object):
             tex_usage = template.tex_usage,
         )
 
-    def texture_release(self, texture):
+    def texture_destroy(self, texture):
         self.interpreter.unregister_object(texture)
 
+    def texture_release(self, surface):
+        pass
+
     def get_tex_surface(self, texture, face, level, zslice, usage):
         return texture.get_surface(face, level, zslice, usage)
     
-    def tex_surface_release(self, surface):
+    def tex_surface_destroy(self, surface):
         self.interpreter.unregister_object(surface)
 
+    def tex_surface_release(self, surface):
+        pass
+
     def surface_write(self, surface, data, stride, size):
         assert surface.nblocksy * stride == size 
         surface.put_tile_raw(0, 0, surface.width, surface.height, data, stride)
-- 
cgit v1.2.3


From 9efa6cafea8176eb867bf820ea82a46ad45bfc15 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Wed, 19 Nov 2008 16:23:01 +0900
Subject: python/retrace: Use the usual BSD-style license.

---
 .../state_trackers/python/retrace/interpreter.py   | 44 +++++++++++++---------
 src/gallium/state_trackers/python/retrace/model.py | 44 +++++++++++++---------
 .../state_trackers/python/retrace/parser.py        | 44 +++++++++++++---------
 3 files changed, 78 insertions(+), 54 deletions(-)

(limited to 'src/gallium/state_trackers/python/retrace/interpreter.py')

diff --git a/src/gallium/state_trackers/python/retrace/interpreter.py b/src/gallium/state_trackers/python/retrace/interpreter.py
index 351a6e739b..a23f153d2f 100755
--- a/src/gallium/state_trackers/python/retrace/interpreter.py
+++ b/src/gallium/state_trackers/python/retrace/interpreter.py
@@ -1,22 +1,30 @@
 #!/usr/bin/env python
-#############################################################################
-#
-# Copyright 2008 Tungsten Graphics, Inc.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#############################################################################
+##########################################################################
+# 
+# Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+# All Rights Reserved.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sub license, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice (including the
+# next paragraph) shall be included in all copies or substantial portions
+# of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+# IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# 
+##########################################################################
 
 
 import sys
diff --git a/src/gallium/state_trackers/python/retrace/model.py b/src/gallium/state_trackers/python/retrace/model.py
index a17a765914..9dd928c7e2 100755
--- a/src/gallium/state_trackers/python/retrace/model.py
+++ b/src/gallium/state_trackers/python/retrace/model.py
@@ -1,22 +1,30 @@
 #!/usr/bin/env python
-#############################################################################
-#
-# Copyright 2008 Tungsten Graphics, Inc.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#############################################################################
+##########################################################################
+# 
+# Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+# All Rights Reserved.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sub license, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice (including the
+# next paragraph) shall be included in all copies or substantial portions
+# of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+# IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# 
+##########################################################################
 
 
 '''Trace data model.'''
diff --git a/src/gallium/state_trackers/python/retrace/parser.py b/src/gallium/state_trackers/python/retrace/parser.py
index 6bc75ad685..e5e8525dfc 100755
--- a/src/gallium/state_trackers/python/retrace/parser.py
+++ b/src/gallium/state_trackers/python/retrace/parser.py
@@ -1,22 +1,30 @@
 #!/usr/bin/env python
-#############################################################################
-#
-# Copyright 2008 Tungsten Graphics, Inc.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-#############################################################################
+##########################################################################
+# 
+# Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+# All Rights Reserved.
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sub license, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice (including the
+# next paragraph) shall be included in all copies or substantial portions
+# of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+# IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# 
+##########################################################################
 
 
 import sys
-- 
cgit v1.2.3


From 56ce90c8bee057cf69ba653adf57aa401d51c240 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Wed, 19 Nov 2008 17:17:06 +0900
Subject: python/retrace: Highlight the trace dump to help to visualize.

---
 .../state_trackers/python/retrace/format.py        | 100 +++++++++++++++++++
 .../state_trackers/python/retrace/interpreter.py   |   6 +-
 src/gallium/state_trackers/python/retrace/model.py | 106 +++++++++++++++------
 .../state_trackers/python/retrace/parser.py        |   8 +-
 4 files changed, 185 insertions(+), 35 deletions(-)
 create mode 100755 src/gallium/state_trackers/python/retrace/format.py

(limited to 'src/gallium/state_trackers/python/retrace/interpreter.py')

diff --git a/src/gallium/state_trackers/python/retrace/format.py b/src/gallium/state_trackers/python/retrace/format.py
new file mode 100755
index 0000000000..0bf6baf0b9
--- /dev/null
+++ b/src/gallium/state_trackers/python/retrace/format.py
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+##########################################################################
+#
+# Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+# All Rights Reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sub license, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice (including the
+# next paragraph) shall be included in all copies or substantial portions
+# of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+# IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+##########################################################################
+
+
+class Formatter:
+    '''Plain formatter'''
+
+    def __init__(self, stream):
+        self.stream = stream
+
+    def text(self, text):
+        self.stream.write(text)
+
+    def newline(self):
+        self.text('\n')
+
+    def function(self, name):
+        self.text(name)
+
+    def variable(self, name):
+        self.text(name)
+
+    def literal(self, value):
+        self.text(str(value))
+
+    def address(self, addr):
+        self.text(str(addr))
+
+
+class AnsiFormatter(Formatter):
+    '''Formatter for plain-text files which outputs ANSI escape codes. See
+    http://en.wikipedia.org/wiki/ANSI_escape_code for more information
+    concerning ANSI escape codes.
+    '''
+
+    _csi = '\33['
+
+    _normal = '0m'
+    _bold = '1m'
+    _italic = '3m'
+    _red = '31m'
+    _green = '32m'
+    _blue = '34m'
+
+    def _escape(self, code):
+        self.text(self._csi + code)
+
+    def function(self, name):
+        self._escape(self._bold)
+        Formatter.function(self, name)
+        self._escape(self._normal)
+
+    def variable(self, name):
+        self._escape(self._italic)
+        Formatter.variable(self, name)
+        self._escape(self._normal)
+
+    def literal(self, value):
+        self._escape(self._blue)
+        Formatter.literal(self, value)
+        self._escape(self._normal)
+
+    def address(self, value):
+        self._escape(self._green)
+        Formatter.address(self, value)
+        self._escape(self._normal)
+
+
+
+def DefaultFormatter(stream):
+    if stream.isatty():
+        return AnsiFormatter(stream)
+    else:
+        return Formatter(stream)
+
diff --git a/src/gallium/state_trackers/python/retrace/interpreter.py b/src/gallium/state_trackers/python/retrace/interpreter.py
index a23f153d2f..61b3ef2abc 100755
--- a/src/gallium/state_trackers/python/retrace/interpreter.py
+++ b/src/gallium/state_trackers/python/retrace/interpreter.py
@@ -440,10 +440,10 @@ class Context(Object):
             show_image(self.cbufs[0])
     
 
-class Interpreter(parser.TraceParser):
+class Interpreter(parser.TraceDumper):
     
     def __init__(self, stream):
-        parser.TraceParser.__init__(self, stream)
+        parser.TraceDumper.__init__(self, stream)
         self.objects = {}
         self.result = None
         self.globl = Global(self, None)
@@ -463,7 +463,7 @@ class Interpreter(parser.TraceParser):
             self.interpret_call(call)
 
     def handle_call(self, call):
-        sys.stderr.write("%s\n" % call)
+        parser.TraceDumper.handle_call(self, call)
         
         args = [self.interpret_arg(arg) for name, arg in call.args] 
         
diff --git a/src/gallium/state_trackers/python/retrace/model.py b/src/gallium/state_trackers/python/retrace/model.py
index 9dd928c7e2..3889db4e72 100755
--- a/src/gallium/state_trackers/python/retrace/model.py
+++ b/src/gallium/state_trackers/python/retrace/model.py
@@ -30,11 +30,27 @@
 '''Trace data model.'''
 
 
+import sys
+import format
+
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from StringIO import StringIO
+
+
 class Node:
     
     def visit(self, visitor):
         raise NotImplementedError
 
+    def __str__(self):
+        stream = StringIO()
+        formatter = format.DefaultFormatter(stream)
+        pretty_printer = PrettyPrinter(formatter)
+        self.visit(pretty_printer)
+        return stream.getvalue()
+
 
 class Literal(Node):
     
@@ -43,12 +59,6 @@ class Literal(Node):
 
     def visit(self, visitor):
         visitor.visit_literal(self)
-        
-    def __str__(self):
-        if isinstance(self.value, str) and len(self.value) > 32:
-            return '...'
-        else: 
-            return repr(self.value)
 
 
 class NamedConstant(Node):
@@ -58,9 +68,6 @@ class NamedConstant(Node):
 
     def visit(self, visitor):
         visitor.visit_named_constant(self)
-        
-    def __str__(self):
-        return self.name
     
 
 class Array(Node):
@@ -70,9 +77,6 @@ class Array(Node):
 
     def visit(self, visitor):
         visitor.visit_array(self)
-        
-    def __str__(self):
-        return '{' + ', '.join([str(value) for value in self.elements]) + '}'
 
 
 class Struct(Node):
@@ -83,9 +87,6 @@ class Struct(Node):
 
     def visit(self, visitor):
         visitor.visit_struct(self)
-        
-    def __str__(self):
-        return '{' + ', '.join([name + ' = ' + str(value) for name, value in self.members]) + '}'
 
         
 class Pointer(Node):
@@ -95,9 +96,6 @@ class Pointer(Node):
 
     def visit(self, visitor):
         visitor.visit_pointer(self)
-        
-    def __str__(self):
-        return self.address
 
 
 class Call:
@@ -110,15 +108,6 @@ class Call:
         
     def visit(self, visitor):
         visitor.visit_call(self)
-        
-    def __str__(self):
-        s = self.method
-        if self.klass:
-            s = self.klass + '::' + s
-        s += '(' + ', '.join([name + ' = ' + str(value) for name, value in self.args]) + ')'
-        if self.ret is not None:
-            s += ' = ' + str(self.ret)
-        return s
 
 
 class Trace:
@@ -128,9 +117,6 @@ class Trace:
         
     def visit(self, visitor):
         visitor.visit_trace(self)
-        
-    def __str__(self):
-        return '\n'.join([str(call) for call in self.calls])
     
     
 class Visitor:
@@ -155,5 +141,65 @@ class Visitor:
     
     def visit_trace(self, node):
         raise NotImplementedError
+
+
+class PrettyPrinter:
+
+    def __init__(self, formatter):
+        self.formatter = formatter
+    
+    def visit_literal(self, node):
+        if isinstance(node.value, str) and len(node.value) > 32:
+            self.formatter.text('...')
+        else: 
+            self.formatter.literal(repr(node.value))
+    
+    def visit_named_constant(self, node):
+        self.formatter.literal(node.name)
     
+    def visit_array(self, node):
+        self.formatter.text('{')
+        sep = ''
+        for value in node.elements:
+            self.formatter.text(sep)
+            value.visit(self) 
+            sep = ', '
+        self.formatter.text('}')
+    
+    def visit_struct(self, node):
+        self.formatter.text('{')
+        sep = ''
+        for name, value in node.members:
+            self.formatter.text(sep)
+            self.formatter.variable(name)
+            self.formatter.text(' = ')
+            value.visit(self) 
+            sep = ', '
+        self.formatter.text('}')
+    
+    def visit_pointer(self, node):
+        self.formatter.address(node.address)
+    
+    def visit_call(self, node):
+        if node.klass is not None:
+            self.formatter.function(node.klass + '::' + node.method)
+        else:
+            self.formatter.function(node.method)
+        self.formatter.text('(')
+        sep = ''
+        for name, value in node.args:
+            self.formatter.text(sep)
+            self.formatter.variable(name)
+            self.formatter.text(' = ')
+            value.visit(self) 
+            sep = ', '
+        if node.ret is not None:
+            self.formatter.text(' = ')
+            node.ret.visit(self)
+        self.formatter.text(')')
+    
+    def visit_trace(self, node):
+        for call in node.calls:
+            call.visit(self)
+            self.formatter.newline()
 
diff --git a/src/gallium/state_trackers/python/retrace/parser.py b/src/gallium/state_trackers/python/retrace/parser.py
index e5e8525dfc..5205f2d8dd 100755
--- a/src/gallium/state_trackers/python/retrace/parser.py
+++ b/src/gallium/state_trackers/python/retrace/parser.py
@@ -327,15 +327,19 @@ class TraceParser(XmlParser):
         return Pointer(address)
 
     def handle_call(self, call):
-        
         pass
     
     
 class TraceDumper(TraceParser):
     
+    def __init__(self, fp):
+        TraceParser.__init__(self, fp)
+        self.formatter = format.DefaultFormatter(sys.stdout)
+        self.pretty_printer = PrettyPrinter(self.formatter)
 
     def handle_call(self, call):
-        print call
+        call.visit(self.pretty_printer)
+        self.formatter.newline()
         
 
 def main(ParserFactory):
-- 
cgit v1.2.3


From 03f19bc33d0c2e94bf0ad4ec6e42b708be0c0967 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Wed, 19 Nov 2008 20:06:04 +0900
Subject: python/retrace: Ignore irrelevant calls.

---
 src/gallium/state_trackers/python/retrace/interpreter.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/gallium/state_trackers/python/retrace/interpreter.py')

diff --git a/src/gallium/state_trackers/python/retrace/interpreter.py b/src/gallium/state_trackers/python/retrace/interpreter.py
index 61b3ef2abc..1918fc9bda 100755
--- a/src/gallium/state_trackers/python/retrace/interpreter.py
+++ b/src/gallium/state_trackers/python/retrace/interpreter.py
@@ -442,6 +442,12 @@ class Context(Object):
 
 class Interpreter(parser.TraceDumper):
     
+    ignore_calls = set((
+            ('pipe_screen', 'is_format_supported'),
+            ('pipe_screen', 'get_param'),
+            ('pipe_screen', 'get_paramf'),
+    ))
+
     def __init__(self, stream):
         parser.TraceDumper.__init__(self, stream)
         self.objects = {}
@@ -463,6 +469,10 @@ class Interpreter(parser.TraceDumper):
             self.interpret_call(call)
 
     def handle_call(self, call):
+
+        if (call.klass, call.method) in self.ignore_calls:
+            return
+
         parser.TraceDumper.handle_call(self, call)
         
         args = [self.interpret_arg(arg) for name, arg in call.args] 
-- 
cgit v1.2.3


From 59ae12b5b14a2bf18c4b566abcdf3211aa5eb4d6 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Thu, 20 Nov 2008 01:02:03 +0900
Subject: python/retrace: Dump constants.

---
 .../state_trackers/python/retrace/interpreter.py        | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'src/gallium/state_trackers/python/retrace/interpreter.py')

diff --git a/src/gallium/state_trackers/python/retrace/interpreter.py b/src/gallium/state_trackers/python/retrace/interpreter.py
index 1918fc9bda..a7ae4c2625 100755
--- a/src/gallium/state_trackers/python/retrace/interpreter.py
+++ b/src/gallium/state_trackers/python/retrace/interpreter.py
@@ -28,6 +28,8 @@
 
 
 import sys
+import struct
+
 import gallium
 import model
 import parser
@@ -206,7 +208,8 @@ class Winsys(Object):
                                          4, 
                                          gallium.PIPE_BUFFER_USAGE_CPU_READ |
                                          gallium.PIPE_BUFFER_USAGE_CPU_WRITE )
-        buffer.write(data, size)
+        assert size == len(data)
+        buffer.write(data)
         return buffer
     
     def buffer_create(self, alignment, usage, size):
@@ -216,7 +219,8 @@ class Winsys(Object):
         pass
     
     def buffer_write(self, buffer, data, size):
-        buffer.write(data, size)
+        assert size == len(data)
+        buffer.write(data)
         
     def fence_finish(self, fence, flags):
         pass
@@ -369,6 +373,15 @@ class Context(Object):
         if state is not None:
             self.real.set_constant_buffer(shader, index, state.buffer)
 
+            if 1:
+                data = state.buffer.read()
+                format = '4f'
+                index = 0
+                for offset in range(0, len(data), struct.calcsize(format)):
+                    x, y, z, w = struct.unpack_from(format, data, offset)
+                    sys.stdout.write('\tCONST[%2u] = {%10.4f, %10.4f, %10.4f, %10.4f}\n' % (index, x, y, z, w))
+                    index += 1
+
     def set_framebuffer_state(self, state):
         _state = gallium.Framebuffer()
         _state.width = state.width
-- 
cgit v1.2.3


From d26a43f6c6ba0e1958e3fafc99b5f110b6e3149a Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Mon, 8 Dec 2008 17:26:02 +0900
Subject: python/retrace: Dump vertex buffer contents.

---
 .../state_trackers/python/retrace/interpreter.py   | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'src/gallium/state_trackers/python/retrace/interpreter.py')

diff --git a/src/gallium/state_trackers/python/retrace/interpreter.py b/src/gallium/state_trackers/python/retrace/interpreter.py
index a7ae4c2625..63ae54736b 100755
--- a/src/gallium/state_trackers/python/retrace/interpreter.py
+++ b/src/gallium/state_trackers/python/retrace/interpreter.py
@@ -240,6 +240,9 @@ class Winsys(Object):
 
 class Screen(Object):
     
+    def destroy(self):
+        pass
+
     def get_name(self):
         pass
     
@@ -292,6 +295,8 @@ class Context(Object):
         Object.__init__(self, interpreter, real)
         self.cbufs = []
         self.zsbuf = None
+        self.vbufs = []
+        self.velems = []
 
     def destroy(self):
         pass
@@ -409,6 +414,7 @@ class Context(Object):
             self.real.set_sampler_texture(i, textures[i])
 
     def set_vertex_buffers(self, n, vbufs):
+        self.vbufs = vbufs[0:n]
         for i in range(n):
             vbuf = vbufs[i]
             self.real.set_vertex_buffer(
@@ -420,6 +426,7 @@ class Context(Object):
             )
 
     def set_vertex_elements(self, n, elements):
+        self.velems = elements[0:n]
         for i in range(n):
             self.real.set_vertex_element(i, elements[i])
         self.real.set_vertex_elements(n)
@@ -429,6 +436,23 @@ class Context(Object):
         pass
     
     def draw_arrays(self, mode, start, count):
+        for index in range(start, start + count):
+            sys.stdout.write('\t{\n')
+            for velem in self.velems:
+                vbuf = self.vbufs[velem.vertex_buffer_index]
+
+                offset = vbuf.buffer_offset + velem.src_offset + vbuf.pitch*index
+                format = {
+                    gallium.PIPE_FORMAT_R32G32B32_FLOAT: '3f',
+                    gallium.PIPE_FORMAT_B8G8R8A8_UNORM: '4B',
+                }[velem.src_format]
+
+                data = vbuf.buffer.read()
+                values = struct.unpack_from(format, data, offset)
+                sys.stdout.write('\t\t{' + ', '.join(map(str, values)) + '},\n')
+                assert len(values) == velem.nr_components
+            sys.stdout.write('\t},\n')
+            
         self.real.draw_arrays(mode, start, count)
     
     def draw_elements(self, indexBuffer, indexSize, mode, start, count):
-- 
cgit v1.2.3


From 51d9642f74c3f418b2f8a56b4b17c94eb91b39d1 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Tue, 9 Dec 2008 19:37:25 +0900
Subject: python/retrace: Dump indices too.

---
 .../state_trackers/python/retrace/interpreter.py   | 45 +++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

(limited to 'src/gallium/state_trackers/python/retrace/interpreter.py')

diff --git a/src/gallium/state_trackers/python/retrace/interpreter.py b/src/gallium/state_trackers/python/retrace/interpreter.py
index 63ae54736b..f418f80d7b 100755
--- a/src/gallium/state_trackers/python/retrace/interpreter.py
+++ b/src/gallium/state_trackers/python/retrace/interpreter.py
@@ -435,15 +435,21 @@ class Context(Object):
         # FIXME
         pass
     
-    def draw_arrays(self, mode, start, count):
+    def dump_vertices(self, start, count):
         for index in range(start, start + count):
+            if index >= start + 16:
+                sys.stdout.write('\t...\n')
+                break
             sys.stdout.write('\t{\n')
             for velem in self.velems:
                 vbuf = self.vbufs[velem.vertex_buffer_index]
 
                 offset = vbuf.buffer_offset + velem.src_offset + vbuf.pitch*index
                 format = {
+                    gallium.PIPE_FORMAT_R32_FLOAT: 'f',
+                    gallium.PIPE_FORMAT_R32G32_FLOAT: '2f',
                     gallium.PIPE_FORMAT_R32G32B32_FLOAT: '3f',
+                    gallium.PIPE_FORMAT_R32G32B32A32_FLOAT: '4f',
                     gallium.PIPE_FORMAT_B8G8R8A8_UNORM: '4B',
                 }[velem.src_format]
 
@@ -452,13 +458,50 @@ class Context(Object):
                 sys.stdout.write('\t\t{' + ', '.join(map(str, values)) + '},\n')
                 assert len(values) == velem.nr_components
             sys.stdout.write('\t},\n')
+
+    def dump_indices(self, ibuf, isize, start, count):
+        format = {
+            1: 'B',
+            2: 'H',
+            4: 'I',
+        }[isize]
+
+        assert struct.calcsize(format) == isize
+
+        data = ibuf.read()
+        maxindex, minindex = 0, 0xffffffff
+
+        sys.stdout.write('\t{\n')
+        for i in range(start, start + count):
+            if i >= start + 16:
+                sys.stdout.write('\t...\n')
+                break
+            offset = i*isize
+            index, = struct.unpack_from(format, data, offset)
+            sys.stdout.write('\t\t%u,\n' % index)
+            minindex = min(minindex, index)
+            maxindex = max(maxindex, index)
+        sys.stdout.write('\t},\n')
+
+        return minindex, maxindex
+
+    def draw_arrays(self, mode, start, count):
+        self.dump_vertices(start, count)
             
         self.real.draw_arrays(mode, start, count)
     
     def draw_elements(self, indexBuffer, indexSize, mode, start, count):
+        minindex, maxindex = self.dump_indices(indexBuffer, indexSize, start, count)
+        self.dump_vertices(minindex, maxindex - minindex)
+
         self.real.draw_elements(indexBuffer, indexSize, mode, start, count)
         
     def draw_range_elements(self, indexBuffer, indexSize, minIndex, maxIndex, mode, start, count):
+        minindex, maxindex = self.dump_indices(indexBuffer, indexSize, start, count)
+        minindex = min(minindex, minIndex)
+        maxindex = min(maxindex, maxIndex)
+        self.dump_vertices(minindex, maxindex - minindex)
+
         self.real.draw_range_elements(indexBuffer, indexSize, minIndex, maxIndex, mode, start, count)
         
     def flush(self, flags):
-- 
cgit v1.2.3