Module: Mesa Branch: master Commit: f95fa3d1ac0a8dfbaa95db441c2744f7ad942dec URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f95fa3d1ac0a8dfbaa95db441c2744f7ad942dec
Author: Christian Gmeiner <[email protected]> Date: Tue Jan 28 05:43:06 2020 +0100 etnaviv: update headers from rnndb Update to etna_viv commit 3bc187a. Signed-off-by: Christian Gmeiner <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4028> --- src/gallium/drivers/etnaviv/hw/cmdstream.xml.h | 6 +++--- src/gallium/drivers/etnaviv/hw/common.xml.h | 10 +++++----- src/gallium/drivers/etnaviv/hw/common_3d.xml.h | 10 +++++----- src/gallium/drivers/etnaviv/hw/isa.xml.h | 6 +++--- src/gallium/drivers/etnaviv/hw/state.xml.h | 22 +++++++++++----------- src/gallium/drivers/etnaviv/hw/state_3d.xml.h | 24 ++++++++++++------------ src/gallium/drivers/etnaviv/hw/state_blt.xml.h | 22 +++++++++++----------- src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h | 10 +++++----- 8 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h b/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h index 002b94b033d..bfab938691b 100644 --- a/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h +++ b/src/gallium/drivers/etnaviv/hw/cmdstream.xml.h @@ -8,9 +8,9 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng git clone git://0x04.net/rules-ng-ng The rules-ng-ng source files this header was generated from are: -- cmdstream.xml ( 16930 bytes, from 2019-01-07 09:52:31) -- copyright.xml ( 1597 bytes, from 2019-01-07 09:52:31) -- common.xml ( 35468 bytes, from 2019-01-07 09:52:31) +- cmdstream.xml ( 16930 bytes, from 2019-01-04 11:37:39) +- copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26) +- common.xml ( 35468 bytes, from 2020-01-04 20:02:31) Copyright (C) 2012-2019 by the following authors: - Wladimir J. van der Laan <[email protected]> diff --git a/src/gallium/drivers/etnaviv/hw/common.xml.h b/src/gallium/drivers/etnaviv/hw/common.xml.h index 81e855bd3f3..fc8c6b3a869 100644 --- a/src/gallium/drivers/etnaviv/hw/common.xml.h +++ b/src/gallium/drivers/etnaviv/hw/common.xml.h @@ -8,12 +8,12 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng git clone git://0x04.net/rules-ng-ng The rules-ng-ng source files this header was generated from are: -- texdesc_3d.xml ( 3183 bytes, from 2019-01-07 09:52:31) -- copyright.xml ( 1597 bytes, from 2019-01-07 09:52:31) -- common.xml ( 35468 bytes, from 2019-01-07 09:52:31) -- common_3d.xml ( 14322 bytes, from 2019-08-19 14:35:07) +- texdesc_3d.xml ( 3183 bytes, from 2018-02-10 13:09:26) +- copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26) +- common.xml ( 35468 bytes, from 2020-01-04 20:02:31) +- common_3d.xml ( 15058 bytes, from 2020-01-24 10:28:28) -Copyright (C) 2012-2019 by the following authors: +Copyright (C) 2012-2020 by the following authors: - Wladimir J. van der Laan <[email protected]> - Christian Gmeiner <[email protected]> - Lucas Stach <[email protected]> diff --git a/src/gallium/drivers/etnaviv/hw/common_3d.xml.h b/src/gallium/drivers/etnaviv/hw/common_3d.xml.h index 8308bffa932..d61e17896c3 100644 --- a/src/gallium/drivers/etnaviv/hw/common_3d.xml.h +++ b/src/gallium/drivers/etnaviv/hw/common_3d.xml.h @@ -8,12 +8,12 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng git clone git://0x04.net/rules-ng-ng The rules-ng-ng source files this header was generated from are: -- texdesc_3d.xml ( 3183 bytes, from 2019-08-09 17:33:50) -- copyright.xml ( 1597 bytes, from 2019-08-09 17:34:08) -- common.xml ( 35468 bytes, from 2019-08-09 17:16:20) -- common_3d.xml ( 14991 bytes, from 2019-09-12 20:32:47) +- texdesc_3d.xml ( 3183 bytes, from 2018-02-10 13:09:26) +- copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26) +- common.xml ( 35468 bytes, from 2020-01-04 20:02:31) +- common_3d.xml ( 15058 bytes, from 2020-01-24 10:28:28) -Copyright (C) 2012-2019 by the following authors: +Copyright (C) 2012-2020 by the following authors: - Wladimir J. van der Laan <[email protected]> - Christian Gmeiner <[email protected]> - Lucas Stach <[email protected]> diff --git a/src/gallium/drivers/etnaviv/hw/isa.xml.h b/src/gallium/drivers/etnaviv/hw/isa.xml.h index b5bf753c047..b75e6e39345 100644 --- a/src/gallium/drivers/etnaviv/hw/isa.xml.h +++ b/src/gallium/drivers/etnaviv/hw/isa.xml.h @@ -8,10 +8,10 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng git clone git://0x04.net/rules-ng-ng The rules-ng-ng source files this header was generated from are: -- isa.xml ( 38205 bytes, from 2019-08-19 14:35:07) -- copyright.xml ( 1597 bytes, from 2019-01-07 09:52:31) +- isa.xml ( 38205 bytes, from 2020-01-10 14:36:29) +- copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26) -Copyright (C) 2012-2019 by the following authors: +Copyright (C) 2012-2020 by the following authors: - Wladimir J. van der Laan <[email protected]> - Christian Gmeiner <[email protected]> - Lucas Stach <[email protected]> diff --git a/src/gallium/drivers/etnaviv/hw/state.xml.h b/src/gallium/drivers/etnaviv/hw/state.xml.h index d296279990e..95a8e78350e 100644 --- a/src/gallium/drivers/etnaviv/hw/state.xml.h +++ b/src/gallium/drivers/etnaviv/hw/state.xml.h @@ -8,17 +8,17 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng git clone git://0x04.net/rules-ng-ng The rules-ng-ng source files this header was generated from are: -- state.xml ( 26666 bytes, from 2019-08-19 14:35:07) -- common.xml ( 35468 bytes, from 2019-01-07 09:52:31) -- common_3d.xml ( 14322 bytes, from 2019-08-19 14:35:07) -- state_hi.xml ( 30232 bytes, from 2019-01-07 09:52:31) -- copyright.xml ( 1597 bytes, from 2019-01-07 09:52:31) -- state_2d.xml ( 51552 bytes, from 2019-01-07 09:52:31) -- state_3d.xml ( 83505 bytes, from 2019-08-19 14:46:17) -- state_blt.xml ( 14252 bytes, from 2019-08-19 14:35:07) -- state_vg.xml ( 5975 bytes, from 2019-01-07 09:52:31) - -Copyright (C) 2012-2019 by the following authors: +- state.xml ( 26666 bytes, from 2020-01-10 14:36:29) +- common.xml ( 35468 bytes, from 2020-01-04 20:02:31) +- common_3d.xml ( 15058 bytes, from 2020-01-24 10:28:28) +- state_hi.xml ( 34405 bytes, from 2020-01-17 08:52:59) +- copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26) +- state_2d.xml ( 51552 bytes, from 2018-02-10 13:09:26) +- state_3d.xml ( 83654 bytes, from 2020-01-28 04:32:26) +- state_blt.xml ( 14252 bytes, from 2020-01-10 14:36:29) +- state_vg.xml ( 5975 bytes, from 2018-02-10 13:09:26) + +Copyright (C) 2012-2020 by the following authors: - Wladimir J. van der Laan <[email protected]> - Christian Gmeiner <[email protected]> - Lucas Stach <[email protected]> diff --git a/src/gallium/drivers/etnaviv/hw/state_3d.xml.h b/src/gallium/drivers/etnaviv/hw/state_3d.xml.h index 15bf478b9cf..6d3216985e9 100644 --- a/src/gallium/drivers/etnaviv/hw/state_3d.xml.h +++ b/src/gallium/drivers/etnaviv/hw/state_3d.xml.h @@ -8,15 +8,15 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng git clone git://0x04.net/rules-ng-ng The rules-ng-ng source files this header was generated from are: -- state.xml ( 26666 bytes, from 2019-08-12 13:32:55) -- common.xml ( 35468 bytes, from 2019-08-09 17:16:20) -- common_3d.xml ( 15058 bytes, from 2019-09-12 20:37:35) -- state_hi.xml ( 30552 bytes, from 2020-01-06 02:44:00) -- copyright.xml ( 1597 bytes, from 2019-08-09 17:34:08) -- state_2d.xml ( 51552 bytes, from 2019-08-09 17:34:00) -- state_3d.xml ( 83644 bytes, from 2020-01-06 02:44:06) -- state_blt.xml ( 14252 bytes, from 2019-09-12 20:21:39) -- state_vg.xml ( 5975 bytes, from 2019-08-09 17:33:52) +- state.xml ( 26666 bytes, from 2020-01-10 14:36:29) +- common.xml ( 35468 bytes, from 2020-01-04 20:02:31) +- common_3d.xml ( 15058 bytes, from 2020-01-24 10:28:28) +- state_hi.xml ( 34405 bytes, from 2020-01-17 08:52:59) +- copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26) +- state_2d.xml ( 51552 bytes, from 2018-02-10 13:09:26) +- state_3d.xml ( 83654 bytes, from 2020-01-28 04:32:26) +- state_blt.xml ( 14252 bytes, from 2020-01-10 14:36:29) +- state_vg.xml ( 5975 bytes, from 2018-02-10 13:09:26) Copyright (C) 2012-2020 by the following authors: - Wladimir J. van der Laan <[email protected]> @@ -1025,9 +1025,9 @@ DEALINGS IN THE SOFTWARE. #define VIVS_PE_STENCIL_CONFIG_EXT_REF_BACK(x) (((x) << VIVS_PE_STENCIL_CONFIG_EXT_REF_BACK__SHIFT) & VIVS_PE_STENCIL_CONFIG_EXT_REF_BACK__MASK) #define VIVS_PE_STENCIL_CONFIG_EXT_REF_BACK_MASK 0x00000100 #define VIVS_PE_STENCIL_CONFIG_EXT_UNK16_MASK 0x00000200 -#define VIVS_PE_STENCIL_CONFIG_EXT_UNK16__MASK 0xffff0000 -#define VIVS_PE_STENCIL_CONFIG_EXT_UNK16__SHIFT 16 -#define VIVS_PE_STENCIL_CONFIG_EXT_UNK16(x) (((x) << VIVS_PE_STENCIL_CONFIG_EXT_UNK16__SHIFT) & VIVS_PE_STENCIL_CONFIG_EXT_UNK16__MASK) +#define VIVS_PE_STENCIL_CONFIG_EXT_EXTRA_ALPHA_REF__MASK 0xffff0000 +#define VIVS_PE_STENCIL_CONFIG_EXT_EXTRA_ALPHA_REF__SHIFT 16 +#define VIVS_PE_STENCIL_CONFIG_EXT_EXTRA_ALPHA_REF(x) (((x) << VIVS_PE_STENCIL_CONFIG_EXT_EXTRA_ALPHA_REF__SHIFT) & VIVS_PE_STENCIL_CONFIG_EXT_EXTRA_ALPHA_REF__MASK) #define VIVS_PE_LOGIC_OP 0x000014a4 #define VIVS_PE_LOGIC_OP_OP__MASK 0x0000000f diff --git a/src/gallium/drivers/etnaviv/hw/state_blt.xml.h b/src/gallium/drivers/etnaviv/hw/state_blt.xml.h index d01a5fc4dba..dfcc513f454 100644 --- a/src/gallium/drivers/etnaviv/hw/state_blt.xml.h +++ b/src/gallium/drivers/etnaviv/hw/state_blt.xml.h @@ -8,17 +8,17 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng git clone git://0x04.net/rules-ng-ng The rules-ng-ng source files this header was generated from are: -- state.xml ( 26666 bytes, from 2019-08-19 14:35:07) -- common.xml ( 35468 bytes, from 2019-01-07 09:52:31) -- common_3d.xml ( 14322 bytes, from 2019-08-19 14:35:07) -- state_hi.xml ( 30232 bytes, from 2019-01-07 09:52:31) -- copyright.xml ( 1597 bytes, from 2019-01-07 09:52:31) -- state_2d.xml ( 51552 bytes, from 2019-01-07 09:52:31) -- state_3d.xml ( 83505 bytes, from 2019-08-19 14:46:17) -- state_blt.xml ( 14252 bytes, from 2019-08-19 14:35:07) -- state_vg.xml ( 5975 bytes, from 2019-01-07 09:52:31) - -Copyright (C) 2012-2019 by the following authors: +- state.xml ( 26666 bytes, from 2020-01-10 14:36:29) +- common.xml ( 35468 bytes, from 2020-01-04 20:02:31) +- common_3d.xml ( 15058 bytes, from 2020-01-24 10:28:28) +- state_hi.xml ( 34405 bytes, from 2020-01-17 08:52:59) +- copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26) +- state_2d.xml ( 51552 bytes, from 2018-02-10 13:09:26) +- state_3d.xml ( 83654 bytes, from 2020-01-28 04:32:26) +- state_blt.xml ( 14252 bytes, from 2020-01-10 14:36:29) +- state_vg.xml ( 5975 bytes, from 2018-02-10 13:09:26) + +Copyright (C) 2012-2020 by the following authors: - Wladimir J. van der Laan <[email protected]> - Christian Gmeiner <[email protected]> - Lucas Stach <[email protected]> diff --git a/src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h b/src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h index 0226c2e3c10..29ec7152ba8 100644 --- a/src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h +++ b/src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h @@ -8,12 +8,12 @@ http://0x04.net/cgit/index.cgi/rules-ng-ng git clone git://0x04.net/rules-ng-ng The rules-ng-ng source files this header was generated from are: -- texdesc_3d.xml ( 3183 bytes, from 2019-08-09 17:33:50) -- copyright.xml ( 1597 bytes, from 2019-08-09 17:34:08) -- common.xml ( 35468 bytes, from 2019-08-09 17:16:20) -- common_3d.xml ( 14991 bytes, from 2019-09-12 20:32:47) +- texdesc_3d.xml ( 3183 bytes, from 2018-02-10 13:09:26) +- copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26) +- common.xml ( 35468 bytes, from 2020-01-04 20:02:31) +- common_3d.xml ( 15058 bytes, from 2020-01-24 10:28:28) -Copyright (C) 2012-2019 by the following authors: +Copyright (C) 2012-2018 by the following authors: - Wladimir J. van der Laan <[email protected]> - Christian Gmeiner <[email protected]> - Lucas Stach <[email protected]> _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
