On Tue, Jun 13, 2017 at 04:36:45PM -0700, Jason Ekstrand wrote: > That was fun to read through... So much code just goes away. :-) I made a > couple of fairly minor suggestions. The one semi-major concern I have is > that I don't see where you convert CCS over. Am I just missing it or is it > in another patch series?
Sorry, I just realized it is a little hidden. Before this series we already use isl_surf_get_ccs_surf() when calculating the layout. Therefore my title is misleading - we already calculate layout for ccs using isl - we just don't use it in blorp but re-calculate it. Here patch "i965/miptree: Refactor aux surface allocation" generalizes the ccs allocation logic in order to reuse it for mcs and hiz. Patch "i965/miptree: Use isl for mcs layouts" moves mcs to isl. In addition to the layout calculation change, it also stops re-calcululating the layout in blorp surface preparation. And as both ccs and mcs use intel_mipmap_tree::mcs_buf to represent the aux, by checking for mcs_buf blorp stops re-calculating the layout for ccs also. I can add something to the commit message or would you like me to split that into another patch? > > --Jason > > On Tue, Jun 13, 2017 at 7:53 AM, Topi Pohjolainen < > [email protected]> wrote: > > > This is also earlier work in the list. Major difference is that > > gen6 hiz is now based on the new "side-by-side" layout. > > > > Topi Pohjolainen (8): > > i965/miptree: Refactor isl aux usage resolver > > i965/gen6: Use isl for hiz > > i965/miptree: Refactor aux surface allocation > > i965/miptree: Use isl for mcs layouts > > i965/miptree: Drop MIPTREE_LAYOUT_ACCELERATED_UPLOAD in mcs init > > i965/miptree/gen7+: Use isl for hiz layouts > > i965/blorp: Use hiz surface instead of creating copy > > i965/wm: Use stored hiz surface instead of creating copy > > > > src/mesa/drivers/dri/i965/brw_blorp.c | 25 +- > > src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 14 +- > > src/mesa/drivers/dri/i965/gen6_depth_state.c | 14 +- > > src/mesa/drivers/dri/i965/gen7_misc_state.c | 5 +- > > src/mesa/drivers/dri/i965/gen8_depth_state.c | 6 +- > > src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 492 > > ++++------------------- > > src/mesa/drivers/dri/i965/intel_mipmap_tree.h | 27 +- > > 7 files changed, 126 insertions(+), 457 deletions(-) > > > > -- > > 2.11.0 > > > > _______________________________________________ > > mesa-dev mailing list > > [email protected] > > https://lists.freedesktop.org/mailman/listinfo/mesa-dev > > _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
