[Mesa-dev] [PATCH 01/20] i965: Define gather push constants opcodes

[Francisco Jerez]

Hi Abdiel,

Abdiel Janulgue <abdiel.janulgue at linux.intel.com> writes:

> Signed-off-by: Abdiel Janulgue <abdiel.janulgue at linux.intel.com>
> ---
>  src/mesa/drivers/dri/i965/brw_defines.h | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_defines.h b/src/mesa/drivers/dri/i965/brw_defines.h
> index a8594af..7b07c50 100644
> --- a/src/mesa/drivers/dri/i965/brw_defines.h
> +++ b/src/mesa/drivers/dri/i965/brw_defines.h
> @@ -2396,6 +2396,26 @@ enum brw_wm_barycentric_interp_mode {
>  #define _3DSTATE_CONSTANT_HS                  0x7819 /* GEN7+ */
>  #define _3DSTATE_CONSTANT_DS                  0x781A /* GEN7+ */
>  
> +/* Resource streamer gather constants */
> +#define _3DSTATE_GATHER_POOL_ALLOC            0x791A /* GEN7.5+ */
> +#define _3DSTATE_GATHER_CONSTANT_VS           0x7834
> +#define _3DSTATE_GATHER_CONSTANT_GS           0x7835
> +#define _3DSTATE_GATHER_CONSTANT_HS           0x7836
> +#define _3DSTATE_GATHER_CONSTANT_DS           0x7837
> +#define _3DSTATE_GATHER_CONSTANT_PS           0x7838
> +/* Only required in HSW */
> +#define HSW_GATHER_CONSTANTS_RESERVED         (3 << 4)
> +

So it's clear which bit-field belongs to which command, can you move
this up before the _3DSTATE_GATHER_CONSTANT_* defines and use the same
prefix as for the command it belongs to
(e.g. HSW_GATHER_POOL_ALLOC_RESERVED).

> +#define BRW_GATHER_CONSTANTS_ENABLE           (1 << 11) /* GEN7.5+ */
> +#define BRW_GATHER_BUFFER_VALID_SHIFT         16
> +#define BRW_GATHER_BUFFER_VALID_MASK          INTEL_MASK(31, 16)
> +#define BRW_GATHER_BINDING_TABLE_BLOCK_SHIFT  12
> +#define BRW_GATHER_BINDING_TABLE_BLOCK_MASK   INTEL_MASK(15, 12)
> +#define BRW_GATHER_CONST_BUFFER_OFFSET_SHIFT  8
> +#define BRW_GATHER_CONST_BUFFER_OFFSET_MASK   INTEL_MASK(15, 8)
> +#define BRW_GATHER_CHANNEL_MASK_SHIFT         4
> +#define BRW_GATHER_CHANNEL_MASK_MASK          INTEL_MASK(7, 4)
> +

BRW seems quite misleading since this command only exists on HSW and up.
I suggest prefixing these with HSW_GATHER_CONSTANT which would also make
it clear that they apply to the GATHER_CONSTANT command and not to
GATHER_POOL_ALLOC.

>  #define _3DSTATE_STREAMOUT                    0x781e /* GEN7+ */
>  /* DW1 */
>  # define SO_FUNCTION_ENABLE				(1 << 31)
> -- 
> 1.9.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 212 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20151019/88c363c2/attachment.sig>