diff options
| author | Roland Scheidegger <[email protected]> | 2010-03-09 15:59:40 +0100 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2010-03-09 15:59:40 +0100 |
| commit | 685340a53e1dcb2a888e634ee71ba24356befe69 (patch) | |
| tree | d6aa301eb5370eac6fcb3186d26a551c37b3c3a2 /progs | |
| parent | e497a58fad878d913a1795b239ddd05870988c58 (diff) | |
| parent | ae7b7bf1edcf6c492b4dcc162bca28a0090f601e (diff) | |
Merge branch 'gallium-vertexelementcso'
Conflicts:
src/gallium/auxiliary/cso_cache/cso_context.c
src/gallium/auxiliary/util/u_blit.c
src/gallium/auxiliary/util/u_gen_mipmap.c
src/gallium/drivers/i915/i915_context.h
src/gallium/drivers/i965/brw_draw_upload.c
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_context.h
src/gallium/drivers/r300/r300_render.c
src/gallium/drivers/r300/r300_state_derived.c
src/mesa/state_tracker/st_cb_bitmap.c
src/mesa/state_tracker/st_cb_clear.c
Diffstat (limited to 'progs')
| -rwxr-xr-x | progs/gallium/python/retrace/interpreter.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/progs/gallium/python/retrace/interpreter.py b/progs/gallium/python/retrace/interpreter.py index b30469dfaee..1a961812553 100755 --- a/progs/gallium/python/retrace/interpreter.py +++ b/progs/gallium/python/retrace/interpreter.py @@ -551,7 +551,6 @@ class Context(Object): data = vbuf.buffer.read() 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') sys.stdout.flush() |