Mesa (master): 35 new commits

Mon Aug 29 19:17:54 UTC 2016

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f4314d06e8b7ac2ecd0adf67a885f9af84dcf557
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Tue Jul 26 11:47:05 2016 -0700

    isl/state: Add some asserts about format capabilities
    
    This keeps invalid surface states from leaking through and potentially
    hanging the GPU.  We shouldn't actually be hitting this on a regular basis,
    but a helpful assert is better than a hang.
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
    Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=87214414fd584aac80bb88f337ba119cac5109f3
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Tue Aug 23 17:13:07 2016 -0700

    intel/blorp: Add a format parameter to blorp_fast_clear
    
    This allows us to use the actual render format as opposed to the texture
    format.  I don't know that the hardware actually cares in the case of fast
    clears, but it certainly seems more correct.
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=348509269ead23cb7f953c174d400e6e3d17d723
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Fri Aug 19 04:27:18 2016 -0700

    i965: Move blorp into src/intel/blorp
    
    At this point, blorp is completely driver agnostic and can be safely moved
    into its own folder.  Soon, we hope to start using it for doing blits in
    the Vulkan driver.
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8bd35d8bd2bff51b39baf559efd9f3a0e20fd2b0
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Fri Aug 19 05:43:29 2016 -0700

    i965/blorp: Remove the remaining brw prefixes from the blorp.h API
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3e46f11409fde40f2d445b81e5697eafd0b23973
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Fri Aug 19 04:30:25 2016 -0700

    i965/blorp: Use isl_format_get_depth_format for setting depth formats
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=555b22a446362a2b0f9bae3c57cdaa330be89edb
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Fri Aug 19 04:28:31 2016 -0700

    i965: Move the type_size function declartaions to brw_nir.h
    
    Signed-of-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
    Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=007d8a6d04a807f5c65c8545398ee5639f2eee31
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Fri Aug 19 03:53:33 2016 -0700

    i965: Move get_fast_clear_rect to blorp_clear.c
    
    This has been the only caller since we deleted the meta fast clear code.
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c8ff36228d6f5d48f700437e4a5520d8b6de13ab
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Fri Aug 19 03:49:45 2016 -0700

    i965: Roll brw_get_ccs_resolve_rect into blorp_ccs_resolve
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=12a2fe538909991dc983de5b6573794ee574048d
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Fri Aug 19 01:58:41 2016 -0700

    i965/blorp: Get rid of most brw and mesa includes
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=87a1cb697937fa01405b0a57470ee69b9cf19998
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Fri Aug 19 03:15:41 2016 -0700

    i965: Move the hiz_op enum to blorp
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=db95a8108f68dfeae10db4f56f721838fd57b36f
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Fri Aug 19 02:23:04 2016 -0700

    i965/blorp: Add a fast_clear_op enum
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=71dc2e0106f4da2c697ec6ad23fc09e960a63bdf
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Fri Aug 19 01:42:31 2016 -0700

    i965/blorp: Make blorp_addres::buffer a void*
    
    The Vulkan driver doesn't use libdrm so we don't want to bake that in.
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2191f5cb7ed3205f8110ca989e13ade517084171
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Fri Aug 19 00:54:56 2016 -0700

    i965/blorp: Get rid of brw_context
    
    This commit switches all of blorp from taking a brw_context to taking a
    blorp_context and, where useful, a void *batch.  In the GL driver, we only
    have one active batch at a time so the brw_context *is* the batch but in
    Vulkan, batch will point to the anv_cmd_buffer in which we are building
    instructions.
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=99b9e9b86ef7277c4953853da8e51e3f7a254a74
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Fri Aug 19 00:49:18 2016 -0700

    i965/blorp: Take a blorp_context in compile_nir_shader
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a818a322440d667a5c143647d070fbc06eb7c328
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Fri Aug 19 00:37:38 2016 -0700

    i965/meta_util: Take an isl_device in get_fast_clear_rect
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc159ff0f7364970dbcb4c73d47c57ddb1aa8303
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Thu Aug 18 10:02:03 2016 -0700

    i965/blorp: Add an "exec" function pointer to blorp_context
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cea360a7087f9533ce596f052070195254a28c9e
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Tue Aug 23 16:49:08 2016 -0700

    i965/blorp: Remove some i965-isms from genX_blorp_exec.h
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cf14b5247869dec60821a86a4698be6d9e417ae3
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Thu Aug 18 09:44:45 2016 -0700

    i965/blorp: Move the guts of brw_blorp_exec into genX_blorp_exec.c
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=28ae664e3b12a21c20d8e2c40b14942f35391581
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Thu Aug 18 09:36:58 2016 -0700

    i965/blorp: Pull the guts of blorp_exec into a driver-agnostic header
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a842c61fe0e8f267072864fd7b916358e21d3f5
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Wed Aug 17 08:31:53 2016 -0700

    i965/blorp/exec: Refactor to use a new blorp_batch struct
    
    This gets rid of brw_context throughout the core of the state setup code.
    Instead, it is replaced with blorp_batch which contains a pointer to the
    blorp_context and a void* that the driver can use for its own blorp data.
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4e7bddf8a3ee89852cb6c1e82afc68280864cb93
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Thu Aug 18 06:36:06 2016 -0700

    i965/blorp: Add a helper for allocating binding tables and surface states
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8a39069dfe070f663e0a9cb2288f6af6d81cb275
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Thu Aug 18 06:29:51 2016 -0700

    i965/blorp: Use BT_INDEX enums for setting up the binding table
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1367af159e6791c230f08ba77311f532f6aede07
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Thu Aug 18 06:29:35 2016 -0700

    i965/blorp: Shorten binding table index enum names
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=da2a078deb8e18364c67cf7767169b46bb8634e5
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Thu Aug 18 02:57:33 2016 -0700

    i965/blorp/genX: Add a blorp_surface_reloc helper
    
    Previously, we passed the buffer address (as per the latest offset from the
    kernel) to ISL to use when it filled out the surface state.  We then called
    drm_intel_bo_emit_reloc() to add the relocation to the list.  The newly
    added blorp_surface_reloc helper adds the relocation to the list and then
    writes the buffer address directly into the surface state.
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ac08bc8ac220f22333536a9f881fde1e5607148e
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Thu Aug 18 02:19:29 2016 -0700

    i965/blorp: Use blorp_address in brw_blorp_surface instead of bo+offset
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=33cc1f6bb4a41571d0f8041bf79b37d674f5602c
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Wed Aug 17 09:42:18 2016 -0700

    i965/blorp: Pull emit_surface_state into genX_blorp_exec.c
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6d2f8f8f5ff52afd965ff94eab6cd5832a16ca6b
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Wed Aug 17 09:31:27 2016 -0700

    i965/blorp: Add driver mocs settings to the context
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9c380b639f47742de1cdaceeb534facc936e3d62
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Wed Aug 17 08:08:36 2016 -0700

    i965/blorp/genX: Move emit_urb_config into another helper
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=28991c9601f9ad3c4f4e11da44a26c8ee0427021
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Wed Aug 17 08:04:43 2016 -0700

    i965/blorp: Use gen6_upload_urb
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7ecbb9bada62a50f5e430ead7fff9154a45afb68
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Wed Aug 17 08:01:01 2016 -0700

    i965/gen6: Refactor gen6_upload_urb
    
    This splits it into two functions very similar to gen7_upload_urb.
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3e4b43d11d5303a84aba79874664cd6514831bb2
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Wed Aug 17 06:55:59 2016 -0700

    i965/blorp/genX: Pull emit_3dstate_multisample into a helper
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=becd434d14d7227575482803c27516818f55b61e
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Wed Aug 17 06:37:59 2016 -0700

    i965/blorp/genX: Add helpers for allocating various bits of state
    
    This pulls most of the brw-specific bits into helpers with generic names.
    Later, those will become the driver hooks for generic code.
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=600446ccc7a95d589e92d0f574eed823b678377c
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Fri Aug 26 10:07:40 2016 -0700

    i965/blorp: Expose the shader cache through function pointers
    
    This sanitizes blorp's access to the i965 driver's shader cache by patching
    it through the blorp_context.  When we start using blorp in Vulkan, we will
    simply have to implement such a caching interface in the Vulkan driver.
    
    Note: In my first attempt at this, I simplified it down to a single
    upload_shader entrypoint and implemented the caching inside of blorp.  This
    doesn't work, however, because the i965 driver will, on occation, dump its
    entire cache and start over.  When this happens, blorp needs to be able to
    recompile its shaders and re-upload them.  It's easiest to just expose the
    caching interface.
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a14d1b63ce74773bec34d0c2b24b7d6fc36d0330
Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Mon Aug 15 15:07:22 2016 -0700

    i965/blorp: Add a blorp_context struct and init/finish funcs
    
    Signed-off-by: Jason Ekstrand <jason at jlekstrand.net>
    Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd18bbeef342152cd1a09e2703790bd48002a6ca
Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Sat Aug 27 17:19:34 2016 +0200

    android: intel: Flatten the makefile structure
    
    Android porting of commit bebc1a1 "intel: Flatten the makefile structure"
    
    Automake approach was followed, by moving makefiles a level up,
    naming them Android.genxml.mk and Android.isl.mk,
    performing the necessary adjustments to the paths,
    adding src/intel/Android.mk and fixing mesa top level makefile.
    
    Acked-by: Jason Ekstrand <jason at jlekstrand.net>