Update to etna_viv commit 1ccc35b. Signed-off-by: Christian Gmeiner <christian.gmei...@gmail.com> --- src/gallium/drivers/etnaviv/hw/common.xml.h | 2 +- .../drivers/etnaviv/hw/common_3d.xml.h | 2 +- src/gallium/drivers/etnaviv/hw/state.xml.h | 4 +-- src/gallium/drivers/etnaviv/hw/state_3d.xml.h | 35 ++++++++++++------- .../drivers/etnaviv/hw/state_blt.xml.h | 4 +-- .../drivers/etnaviv/hw/texdesc_3d.xml.h | 2 +- 6 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/src/gallium/drivers/etnaviv/hw/common.xml.h b/src/gallium/drivers/etnaviv/hw/common.xml.h index 4af7ec3693a..4416ecc872e 100644 --- a/src/gallium/drivers/etnaviv/hw/common.xml.h +++ b/src/gallium/drivers/etnaviv/hw/common.xml.h @@ -11,7 +11,7 @@ The rules-ng-ng source files this header was generated from are: - 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 2018-02-10 13:09:26) -- common_3d.xml ( 14843 bytes, from 2019-01-18 10:13:41) +- common_3d.xml ( 14843 bytes, from 2019-04-16 07:18:44) Copyright (C) 2012-2018 by the following authors: - Wladimir J. van der Laan <laa...@gmail.com> diff --git a/src/gallium/drivers/etnaviv/hw/common_3d.xml.h b/src/gallium/drivers/etnaviv/hw/common_3d.xml.h index 46a26df79dc..bf5cfe1cf64 100644 --- a/src/gallium/drivers/etnaviv/hw/common_3d.xml.h +++ b/src/gallium/drivers/etnaviv/hw/common_3d.xml.h @@ -11,7 +11,7 @@ The rules-ng-ng source files this header was generated from are: - 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 2018-02-10 13:09:26) -- common_3d.xml ( 14843 bytes, from 2019-01-18 10:13:41) +- common_3d.xml ( 14843 bytes, from 2019-04-16 07:18:44) Copyright (C) 2012-2019 by the following authors: - Wladimir J. van der Laan <laa...@gmail.com> diff --git a/src/gallium/drivers/etnaviv/hw/state.xml.h b/src/gallium/drivers/etnaviv/hw/state.xml.h index 5b4b8698283..bb770328cdd 100644 --- a/src/gallium/drivers/etnaviv/hw/state.xml.h +++ b/src/gallium/drivers/etnaviv/hw/state.xml.h @@ -10,11 +10,11 @@ git clone git://0x04.net/rules-ng-ng The rules-ng-ng source files this header was generated from are: - state.xml ( 26087 bytes, from 2018-02-10 13:09:26) - common.xml ( 35468 bytes, from 2018-02-10 13:09:26) -- common_3d.xml ( 14843 bytes, from 2019-01-18 10:13:41) +- common_3d.xml ( 14843 bytes, from 2019-04-16 07:18:44) - state_hi.xml ( 30232 bytes, from 2018-03-30 07:48:22) - 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 ( 79992 bytes, from 2019-01-18 10:10:57) +- state_3d.xml ( 80352 bytes, from 2019-04-23 18:58:17) - state_blt.xml ( 13405 bytes, from 2018-02-10 13:09:26) - state_vg.xml ( 5975 bytes, from 2018-02-10 13:09:26) diff --git a/src/gallium/drivers/etnaviv/hw/state_3d.xml.h b/src/gallium/drivers/etnaviv/hw/state_3d.xml.h index dacf252feb0..cbd0fa6c6b0 100644 --- a/src/gallium/drivers/etnaviv/hw/state_3d.xml.h +++ b/src/gallium/drivers/etnaviv/hw/state_3d.xml.h @@ -10,11 +10,11 @@ git clone git://0x04.net/rules-ng-ng The rules-ng-ng source files this header was generated from are: - state.xml ( 26087 bytes, from 2018-02-10 13:09:26) - common.xml ( 35468 bytes, from 2018-02-10 13:09:26) -- common_3d.xml ( 14843 bytes, from 2019-01-18 10:13:41) +- common_3d.xml ( 14843 bytes, from 2019-04-16 07:18:44) - state_hi.xml ( 30232 bytes, from 2018-03-30 07:48:22) - 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 ( 79992 bytes, from 2019-01-18 10:10:57) +- state_3d.xml ( 80352 bytes, from 2019-04-23 18:58:17) - state_blt.xml ( 13405 bytes, from 2018-02-10 13:09:26) - state_vg.xml ( 5975 bytes, from 2018-02-10 13:09:26) @@ -1351,25 +1351,36 @@ DEALINGS IN THE SOFTWARE. #define VIVS_YUV 0x00000000 -#define VIVS_YUV_UNK01678 0x00001678 +#define VIVS_YUV_CONFIG 0x00001678 +#define VIVS_YUV_CONFIG_ENABLE 0x00000001 +#define VIVS_YUV_CONFIG_SOURCE_FORMAT__MASK 0x00000030 +#define VIVS_YUV_CONFIG_SOURCE_FORMAT__SHIFT 4 +#define VIVS_YUV_CONFIG_SOURCE_FORMAT(x) (((x) << VIVS_YUV_CONFIG_SOURCE_FORMAT__SHIFT) & VIVS_YUV_CONFIG_SOURCE_FORMAT__MASK) +#define VIVS_YUV_CONFIG_UV_SWAP 0x00000100 -#define VIVS_YUV_UNK0167C 0x0000167c +#define VIVS_YUV_WINDOW_SIZE 0x0000167c +#define VIVS_YUV_WINDOW_SIZE_HEIGHT__MASK 0xffff0000 +#define VIVS_YUV_WINDOW_SIZE_HEIGHT__SHIFT 16 +#define VIVS_YUV_WINDOW_SIZE_HEIGHT(x) (((x) << VIVS_YUV_WINDOW_SIZE_HEIGHT__SHIFT) & VIVS_YUV_WINDOW_SIZE_HEIGHT__MASK) +#define VIVS_YUV_WINDOW_SIZE_WIDTH__MASK 0x0000ffff +#define VIVS_YUV_WINDOW_SIZE_WIDTH__SHIFT 0 +#define VIVS_YUV_WINDOW_SIZE_WIDTH(x) (((x) << VIVS_YUV_WINDOW_SIZE_WIDTH__SHIFT) & VIVS_YUV_WINDOW_SIZE_WIDTH__MASK) -#define VIVS_YUV_UNK01680 0x00001680 +#define VIVS_YUV_Y_BASE 0x00001680 -#define VIVS_YUV_UNK01684 0x00001684 +#define VIVS_YUV_Y_STRIDE 0x00001684 -#define VIVS_YUV_UNK01688 0x00001688 +#define VIVS_YUV_U_BASE 0x00001688 -#define VIVS_YUV_UNK0168C 0x0000168c +#define VIVS_YUV_U_STRIDE 0x0000168c -#define VIVS_YUV_UNK01690 0x00001690 +#define VIVS_YUV_V_BASE 0x00001690 -#define VIVS_YUV_UNK01694 0x00001694 +#define VIVS_YUV_V_STRIDE 0x00001694 -#define VIVS_YUV_UNK01698 0x00001698 +#define VIVS_YUV_DEST_BASE 0x00001698 -#define VIVS_YUV_UNK0169C 0x0000169c +#define VIVS_YUV_DEST_STRIDE 0x0000169c #define VIVS_TE 0x00000000 diff --git a/src/gallium/drivers/etnaviv/hw/state_blt.xml.h b/src/gallium/drivers/etnaviv/hw/state_blt.xml.h index 3ed2a1f5a87..874e2e5bd9d 100644 --- a/src/gallium/drivers/etnaviv/hw/state_blt.xml.h +++ b/src/gallium/drivers/etnaviv/hw/state_blt.xml.h @@ -10,11 +10,11 @@ git clone git://0x04.net/rules-ng-ng The rules-ng-ng source files this header was generated from are: - state.xml ( 26087 bytes, from 2018-02-10 13:09:26) - common.xml ( 35468 bytes, from 2018-02-10 13:09:26) -- common_3d.xml ( 14843 bytes, from 2019-01-18 10:13:41) +- common_3d.xml ( 14843 bytes, from 2019-04-16 07:18:44) - state_hi.xml ( 30232 bytes, from 2018-03-30 07:48:22) - 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 ( 79992 bytes, from 2019-01-18 10:10:57) +- state_3d.xml ( 80352 bytes, from 2019-04-23 18:58:17) - state_blt.xml ( 13405 bytes, from 2018-02-10 13:09:26) - state_vg.xml ( 5975 bytes, from 2018-02-10 13:09:26) diff --git a/src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h b/src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h index 353a57e5ceb..8dc12dbac0c 100644 --- a/src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h +++ b/src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h @@ -11,7 +11,7 @@ The rules-ng-ng source files this header was generated from are: - 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 2018-02-10 13:09:26) -- common_3d.xml ( 14843 bytes, from 2019-01-18 10:13:41) +- common_3d.xml ( 14843 bytes, from 2019-04-16 07:18:44) Copyright (C) 2012-2018 by the following authors: - Wladimir J. van der Laan <laa...@gmail.com> -- 2.20.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
