Hi Eric, They are not the same. Gallium has 68afbe89c72d085dcbbf2b264f0201ab73fe339e. If the change is applied to the common version, you will have my Rb.
Marek On Sat, Jan 24, 2015 at 12:37 AM, Eric Anholt <e...@anholt.net> wrote: > The code was exactly the same, except util/ has c++ guards and a struct > simple_node declaration. > --- > > For my NIR work, there were clashes between gallium's copy (from my driver) > and Mesa's (from NIR) > > src/gallium/auxiliary/Makefile.sources | 1 - > src/gallium/auxiliary/draw/draw_llvm.c | 2 +- > src/gallium/auxiliary/draw/draw_llvm.h | 2 +- > src/gallium/auxiliary/gallivm/lp_bld_init.c | 2 +- > src/gallium/auxiliary/util/u_cache.c | 2 +- > src/gallium/auxiliary/util/u_simple_list.h | 199 > -------------------------- > src/gallium/auxiliary/util/u_slab.c | 2 +- > src/gallium/drivers/llvmpipe/lp_context.c | 2 +- > src/gallium/drivers/llvmpipe/lp_scene.c | 2 +- > src/gallium/drivers/llvmpipe/lp_state_fs.c | 2 +- > src/gallium/drivers/llvmpipe/lp_state_setup.c | 2 +- > src/gallium/drivers/llvmpipe/lp_texture.c | 2 +- > src/gallium/drivers/r300/r300_context.c | 2 +- > src/gallium/drivers/r300/r300_flush.c | 2 +- > src/gallium/drivers/r300/r300_query.c | 2 +- > src/gallium/drivers/rbug/rbug_context.c | 2 +- > src/gallium/drivers/rbug/rbug_core.c | 2 +- > src/gallium/drivers/rbug/rbug_objects.c | 2 +- > src/gallium/drivers/rbug/rbug_screen.c | 2 +- > src/gallium/drivers/trace/tr_context.c | 2 +- > src/gallium/drivers/trace/tr_screen.c | 2 +- > src/gallium/drivers/trace/tr_texture.c | 2 +- > src/gallium/drivers/vc4/vc4_qir.c | 2 +- > src/gallium/drivers/vc4/vc4_qir.h | 7 +- > src/gallium/winsys/radeon/drm/radeon_drm_bo.c | 2 +- > 25 files changed, 23 insertions(+), 228 deletions(-) > delete mode 100644 src/gallium/auxiliary/util/u_simple_list.h _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
