This series is one more go at fixing texture_from_pixmap. The previous patches I apparently didn't test well enough because it regressed a bunch of tests when I ran it through Jenkins today. These are all fixed by the new patch 1 and the corresponding hunk in patch 2. I've also re-ordered things a bit so that "Pull the tex format from the renderbuffer in intelSetTexBuffer2" before "Reference the renderbuffer miptree in setTexBuffer2" to address some concerns from Chad
Cc: Chad Versace <chadvers...@chromium.org> Cc: Kenneth Graunke <kenn...@whitecape.org> Jason Ekstrand (6): i965/miptree: Add a helper for getting the textureable format i965/miptree: Loosen the format check in miptree_match_image i965/tex_image: Pull the tex format from the renderbuffer in intelSetTexBuffer2 i965/tex_image: Reference the renderbuffer miptree in setTexBuffer2 i965: Use finish_external instead of make_shareable in setTexBuffer2 intel/isl: Improve the documentation on get_default_aux_state src/intel/isl/isl.h | 24 ++++- src/mesa/drivers/dri/i965/brw_draw.c | 3 +- src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 10 ++- src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 57 +++++++++++- src/mesa/drivers/dri/i965/intel_mipmap_tree.h | 9 ++ src/mesa/drivers/dri/i965/intel_screen.c | 2 +- src/mesa/drivers/dri/i965/intel_tex.c | 2 +- src/mesa/drivers/dri/i965/intel_tex.h | 2 + src/mesa/drivers/dri/i965/intel_tex_image.c | 107 ++++++++++++++++++----- src/mesa/drivers/dri/i965/intel_tex_obj.h | 4 +- src/mesa/drivers/dri/i965/intel_tex_validate.c | 2 +- 11 files changed, 185 insertions(+), 37 deletions(-) -- 2.5.0.400.gff86faf _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev