Mesa (gallium-mesa-7.4): python/retrace: Cope with python 2.4.x

[Keith Whitwell]

Module: Mesa
Branch: gallium-mesa-7.4
Commit: 204526a6d277265b9872d4681e70c58d57038926
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=204526a6d277265b9872d4681e70c58d57038926

Author: José Fonseca <jfons...@vmware.com>
Date:   Fri Feb 20 15:02:19 2009 +0000

python/retrace: Cope with python 2.4.x

---

 .../state_trackers/python/retrace/interpreter.py   |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/gallium/state_trackers/python/retrace/interpreter.py 
b/src/gallium/state_trackers/python/retrace/interpreter.py
index f418f80..181113c 100755
--- a/src/gallium/state_trackers/python/retrace/interpreter.py
+++ b/src/gallium/state_trackers/python/retrace/interpreter.py
@@ -35,6 +35,14 @@ import model
 import parser
 
 
+try:
+    from struct import unpack_from
+except ImportError:
+    def unpack_from(fmt, buf, offset=0):
+        size = struct.calcsize(fmt)
+        return struct.unpack(fmt, buf[offset:offset + size])
+
+
 def make_image(surface):
     pixels = gallium.FloatArray(surface.height*surface.width*4)
     surface.get_tile_rgba(0, 0, surface.width, surface.height, pixels)
@@ -383,7 +391,7 @@ class Context(Object):
                 format = '4f'
                 index = 0
                 for offset in range(0, len(data), struct.calcsize(format)):
-                    x, y, z, w = struct.unpack_from(format, data, offset)
+                    x, y, z, w = 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
 
@@ -454,7 +462,7 @@ class Context(Object):
                 }[velem.src_format]
 
                 data = vbuf.buffer.read()
-                values = struct.unpack_from(format, data, offset)
+                values = 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')
@@ -477,7 +485,7 @@ class Context(Object):
                 sys.stdout.write('\t...\n')
                 break
             offset = i*isize
-            index, = struct.unpack_from(format, data, offset)
+            index, = unpack_from(format, data, offset)
             sys.stdout.write('\t\t%u,\n' % index)
             minindex = min(minindex, index)
             maxindex = max(maxindex, index)

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit