[Mesa-dev] [PATCH v4 00/34] i965: Use ISL for emitting surface state

[Jason Ekstrand]

This is a resend of the latest version of this patch series mostly for
Chad's benifit.  Hopefully we can finally get this reviewed and landed yet
this week.

The first two patches are because some untested bits of the isl patches I
pushed today didn't work as intended.  They're pretty trivial but needed
for the rest of the series.  The rest is a rebase of the series on top of
the latest isl changes.

Jason Ekstrand (34):
  isl: Fix the bs assertion in isl_tiling_get_info
  isl/state: Divide the aux qpitch by 2
  genxml: Add enough XML for gens 4, 4.5, and 5 to get SURFACE_STATE
  genxml: Make X/Y Offset field of SURFACE_STATE a uint
  genxml: Add macros and #includes for gens 4-6
  isl: Add an ISL_DEV_IS_G4X macro
  isl: Add support for filling out surface states all the way back to
    gen4
  isl/state: Add support for OffsetX/Y in surface state
  i965: Add an isl_device to the brw_context
  i965/miptree: Add a helper for getting an isl_surf from a miptree
  i965/miptree: Add a helper for getting the ISL clear color from a
    miptree
  i965/miptree: Add a helper for getting the aux isl_surf from a miptree
  i965/blorp: Add a generic ISL-based surface state emit path
  i965/blorp: Use the generic ISL path for renderbuffer surfaces on
    gen8-9
  i965/blorp: Use the generic ISL path for renderbuffer surfaces on gen7
  i965/blorp: Use the generic ISL path for texture surfaces on gen7
  i965/blorp: Use the generic ISL path for renderbuffer surfaces on gen6
  i965/blorp: Use the generic ISL path for texture surfaces on gen6
  i965/state: Add a helper for emitting a surface state using isl
  i965/blorp: Use a generic ISL path for texture surfaces on gen8
  i965/state: Use ISL for emitting image surfaces
  i965/surface_state: Rename brw_update to gen4_update
  i965/state: Add generic surface update functions based on ISL
  i965/gen8: Use the generic ISL-based path for texture surfaces
  i965/gen8: Use the generic ISL-based path for renderbuffer surfaces
  i965/gen7: Use the generic ISL-based path for texture surfaces
  i965/gen7: Use the generic ISL-based path for renderbuffer surfaces
  i965/gen6: Use the generic ISL-based path for renderbuffer surfaces
  i965/gen4-6: Use the generic ISL-based path for texture surfaces
  isl/formats: Mark RAW as having a block size of 1 byte
  i965/state: Account for the element size in emit_buffer_surface_state
  i965: Use ISL for emitting buffer surface states
  i965: Get rid of gen6_surface_state.c
  i965/context: Remove some unnecessary vfuncs

 src/intel/genxml/Android.mk                       |  15 +
 src/intel/genxml/Makefile.am                      |   3 +
 src/intel/genxml/Makefile.sources                 |   3 +
 src/intel/genxml/gen4.xml                         |  52 +++
 src/intel/genxml/gen45.xml                        |  56 +++
 src/intel/genxml/gen5.xml                         |  56 +++
 src/intel/genxml/gen6.xml                         |   4 +-
 src/intel/genxml/gen7.xml                         |   4 +-
 src/intel/genxml/gen75.xml                        |   4 +-
 src/intel/genxml/gen8.xml                         |   4 +-
 src/intel/genxml/gen9.xml                         |   4 +-
 src/intel/genxml/genX_pack.h                      |  10 +-
 src/intel/genxml/gen_macros.h                     |  15 +-
 src/intel/isl/Android.mk                          |  60 +++
 src/intel/isl/Makefile.am                         |  12 +
 src/intel/isl/Makefile.sources                    |  13 +-
 src/intel/isl/isl.c                               |  29 +-
 src/intel/isl/isl.h                               |   7 +
 src/intel/isl/isl_format_layout.csv               |   2 +-
 src/intel/isl/isl_priv.h                          |  24 ++
 src/intel/isl/isl_surface_state.c                 |  86 +++-
 src/mesa/drivers/dri/i965/Makefile.sources        |   1 -
 src/mesa/drivers/dri/i965/brw_binding_tables.c    |   2 +-
 src/mesa/drivers/dri/i965/brw_blorp.c             | 157 +++++++
 src/mesa/drivers/dri/i965/brw_blorp.h             |   6 +
 src/mesa/drivers/dri/i965/brw_context.c           |   2 +
 src/mesa/drivers/dri/i965/brw_context.h           |  29 +-
 src/mesa/drivers/dri/i965/brw_state.h             |  49 ++-
 src/mesa/drivers/dri/i965/brw_wm_surface_state.c  | 501 ++++++++++++++-------
 src/mesa/drivers/dri/i965/gen6_blorp.c            |  82 +---
 src/mesa/drivers/dri/i965/gen6_surface_state.c    | 146 -------
 src/mesa/drivers/dri/i965/gen7_blorp.c            | 104 +----
 src/mesa/drivers/dri/i965/gen7_cs_state.c         |   2 +-
 src/mesa/drivers/dri/i965/gen7_wm_surface_state.c | 407 +----------------
 src/mesa/drivers/dri/i965/gen8_blorp.c            | 146 ++-----
 src/mesa/drivers/dri/i965/gen8_surface_state.c    | 503 +---------------------
 src/mesa/drivers/dri/i965/intel_mipmap_tree.c     | 319 +++++++++++++-
 src/mesa/drivers/dri/i965/intel_mipmap_tree.h     |  15 +
 38 files changed, 1370 insertions(+), 1564 deletions(-)
 create mode 100644 src/intel/genxml/gen4.xml
 create mode 100644 src/intel/genxml/gen45.xml
 create mode 100644 src/intel/genxml/gen5.xml
 delete mode 100644 src/mesa/drivers/dri/i965/gen6_surface_state.c

-- 
2.5.0.400.gff86faf