This patch series provides fixes for the texture_from_pixmap path when
modifiers are used. All but the first and last patches are reviewed. I
haven't pushed to land anything yet because ee57b15ec764736e disabled CCS
for miptrees with sRGB formats and that caused TFP to always get a resolve
which kind-of defeats the purpose. Now that the real issue has been found
and fixed and CCS for sRGB images has been re-enabled, we can go back to
our regularly scheduled patch merging.
The only new patch is 6 which is required because patch 3 starts making the
intel_texture_object contain the GL format for texture views and not the
hacked up format we used to use. We have to do the format hacks for depth
and ETC2 in texture upload now.
Jason Ekstrand (6):
i965/state: Ignore intel_obj->_Format for depth/stencil
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_wm_surface_state.c | 14 ++-
src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 25 +++++-
src/mesa/drivers/dri/i965/intel_mipmap_tree.h | 3 +
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 +-
10 files changed, 152 insertions(+), 33 deletions(-)
--
2.5.0.400.gff86faf
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
