From b24cb40188997aa4920812d5d52e14e64dab64d6 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Tue, 14 Nov 2017 10:21:19 +0100 Subject: [PATCH] etnaviv: rnndb update Signed-off-by: Wladimir J. van der Laan Reviewed-by: Christian Gmeiner --- src/gallium/drivers/etnaviv/hw/common.xml.h | 2 +- src/gallium/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 | 14 ++++++++++++-- src/gallium/drivers/etnaviv/hw/state_blt.xml.h | 4 ++-- src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h | 3 ++- 6 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/gallium/drivers/etnaviv/hw/common.xml.h b/src/gallium/drivers/etnaviv/hw/common.xml.h index b98fa8418d4..60bde8b96b8 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 2017-10-31 19:05:01) - copyright.xml ( 1597 bytes, from 2016-10-29 07:29:22) - common.xml ( 26187 bytes, from 2017-10-31 19:05:01) -- common_3d.xml ( 14547 bytes, from 2017-11-01 16:08:07) +- common_3d.xml ( 14615 bytes, from 2017-11-04 14:03:35) Copyright (C) 2012-2017 by the following authors: - Wladimir J. van der Laan diff --git a/src/gallium/drivers/etnaviv/hw/common_3d.xml.h b/src/gallium/drivers/etnaviv/hw/common_3d.xml.h index 8f19d5b90f0..d110a36682e 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 2017-10-31 19:05:01) - copyright.xml ( 1597 bytes, from 2016-10-29 07:29:22) - common.xml ( 26187 bytes, from 2017-10-31 19:05:01) -- common_3d.xml ( 14547 bytes, from 2017-11-01 16:08:07) +- common_3d.xml ( 14615 bytes, from 2017-11-04 14:03:35) Copyright (C) 2012-2017 by the following authors: - Wladimir J. van der Laan diff --git a/src/gallium/drivers/etnaviv/hw/state.xml.h b/src/gallium/drivers/etnaviv/hw/state.xml.h index 0a93a4f9d55..485c0eb28b3 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 2017-10-30 13:44:54) - common.xml ( 26187 bytes, from 2017-10-31 19:05:01) -- common_3d.xml ( 14547 bytes, from 2017-11-01 16:08:07) +- common_3d.xml ( 14615 bytes, from 2017-11-04 14:03:35) - state_hi.xml ( 27733 bytes, from 2017-10-02 19:00:30) - copyright.xml ( 1597 bytes, from 2016-10-29 07:29:22) - state_2d.xml ( 51552 bytes, from 2016-10-29 07:29:22) -- state_3d.xml ( 79520 bytes, from 2017-10-31 19:05:01) +- state_3d.xml ( 79992 bytes, from 2017-11-07 10:44:35) - state_blt.xml ( 13405 bytes, from 2017-10-16 17:42:46) - state_vg.xml ( 5975 bytes, from 2016-10-29 07:29:22) diff --git a/src/gallium/drivers/etnaviv/hw/state_3d.xml.h b/src/gallium/drivers/etnaviv/hw/state_3d.xml.h index c5722aafa1b..13122789ec1 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 2017-10-30 13:44:54) - common.xml ( 26187 bytes, from 2017-10-31 19:05:01) -- common_3d.xml ( 14547 bytes, from 2017-11-01 16:08:07) +- common_3d.xml ( 14615 bytes, from 2017-11-04 14:03:35) - state_hi.xml ( 27733 bytes, from 2017-10-02 19:00:30) - copyright.xml ( 1597 bytes, from 2016-10-29 07:29:22) - state_2d.xml ( 51552 bytes, from 2016-10-29 07:29:22) -- state_3d.xml ( 79520 bytes, from 2017-10-31 19:05:01) +- state_3d.xml ( 79992 bytes, from 2017-11-07 10:44:35) - state_blt.xml ( 13405 bytes, from 2017-10-16 17:42:46) - state_vg.xml ( 5975 bytes, from 2016-10-29 07:29:22) @@ -122,6 +122,14 @@ DEALINGS IN THE SOFTWARE. #define LOGIC_OP_OR_REVERSE 0x0000000d #define LOGIC_OP_OR 0x0000000e #define LOGIC_OP_SET 0x0000000f +#define TS_SAMPLER_FORMAT_A4R4G4B4 0x00000000 +#define TS_SAMPLER_FORMAT_A1R5G5B5 0x00000001 +#define TS_SAMPLER_FORMAT_R5G6B5 0x00000002 +#define TS_SAMPLER_FORMAT_A8R8G8B8 0x00000003 +#define TS_SAMPLER_FORMAT_X8R8G8B8 0x00000004 +#define TS_SAMPLER_FORMAT_D24X8 0x00000005 +#define TS_SAMPLER_FORMAT_D16 0x00000008 +#define TS_SAMPLER_FORMAT_RAW 0x0000000f #define VARYING_NUM_COMPONENTS_VAR0__MASK 0x00000007 #define VARYING_NUM_COMPONENTS_VAR0__SHIFT 0 #define VARYING_NUM_COMPONENTS_VAR0(x) (((x) << VARYING_NUM_COMPONENTS_VAR0__SHIFT) & VARYING_NUM_COMPONENTS_VAR0__MASK) @@ -1469,6 +1477,7 @@ DEALINGS IN THE SOFTWARE. #define VIVS_TE_SAMPLER_CONFIG1_HALIGN__MASK 0x1c000000 #define VIVS_TE_SAMPLER_CONFIG1_HALIGN__SHIFT 26 #define VIVS_TE_SAMPLER_CONFIG1_HALIGN(x) (((x) << VIVS_TE_SAMPLER_CONFIG1_HALIGN__SHIFT) & VIVS_TE_SAMPLER_CONFIG1_HALIGN__MASK) +#define VIVS_TE_SAMPLER_CONFIG1_USE_TS 0x40000000 #define VIVS_TE_SAMPLER_UNK02200(i0) (0x00002200 + 0x4*(i0)) @@ -1588,6 +1597,7 @@ DEALINGS IN THE SOFTWARE. #define VIVS_NTE_SAMPLER_CONFIG1_HALIGN__MASK 0x1c000000 #define VIVS_NTE_SAMPLER_CONFIG1_HALIGN__SHIFT 26 #define VIVS_NTE_SAMPLER_CONFIG1_HALIGN(x) (((x) << VIVS_NTE_SAMPLER_CONFIG1_HALIGN__SHIFT) & VIVS_NTE_SAMPLER_CONFIG1_HALIGN__MASK) +#define VIVS_NTE_SAMPLER_CONFIG1_USE_TS 0x40000000 #define VIVS_NTE_SAMPLER_UNK10400(i0) (0x00010400 + 0x4*(i0)) diff --git a/src/gallium/drivers/etnaviv/hw/state_blt.xml.h b/src/gallium/drivers/etnaviv/hw/state_blt.xml.h index 5ea439a70a1..b953a379f35 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 2017-10-30 13:44:54) - common.xml ( 26187 bytes, from 2017-10-31 19:05:01) -- common_3d.xml ( 14547 bytes, from 2017-11-01 16:08:07) +- common_3d.xml ( 14615 bytes, from 2017-11-04 14:03:35) - state_hi.xml ( 27733 bytes, from 2017-10-02 19:00:30) - copyright.xml ( 1597 bytes, from 2016-10-29 07:29:22) - state_2d.xml ( 51552 bytes, from 2016-10-29 07:29:22) -- state_3d.xml ( 79520 bytes, from 2017-10-31 19:05:01) +- state_3d.xml ( 79992 bytes, from 2017-11-07 10:44:35) - state_blt.xml ( 13405 bytes, from 2017-10-16 17:42:46) - state_vg.xml ( 5975 bytes, from 2016-10-29 07:29:22) diff --git a/src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h b/src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h index 4916938e9db..8bfc0e5440d 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 2017-10-31 19:05:01) - copyright.xml ( 1597 bytes, from 2016-10-29 07:29:22) - common.xml ( 26187 bytes, from 2017-10-31 19:05:01) -- common_3d.xml ( 14547 bytes, from 2017-11-01 16:08:07) +- common_3d.xml ( 14615 bytes, from 2017-11-04 14:03:35) Copyright (C) 2012-2017 by the following authors: - Wladimir J. van der Laan @@ -108,6 +108,7 @@ DEALINGS IN THE SOFTWARE. #define TEXDESC_CONFIG1_HALIGN__MASK 0x1c000000 #define TEXDESC_CONFIG1_HALIGN__SHIFT 26 #define TEXDESC_CONFIG1_HALIGN(x) (((x) << TEXDESC_CONFIG1_HALIGN__SHIFT) & TEXDESC_CONFIG1_HALIGN__MASK) +#define TEXDESC_CONFIG1_USE_TS 0x40000000 #define TEXDESC_CONTROL_YUV 0x00000050 -- 2.30.2