AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

etnaviv: update headers from rnndb

Browse Source 
Update to etna_viv commit 8a8b13a and use new names in the code.

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
This commit is contained in:
Jonathan Marek
2019-07-01 16:07:56 -04:00
parent c314ba2c26
commit 2f540745ad
9 changed files with 95 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/etnaviv/etnaviv_blt.c
+7 -7
View File
@@ -68,7 +68,7 @@ blt_compute_img_config_bits(const struct blt_imginfo *img, bool for_dest)
tiling_bits |= for_dest ? BLT_IMAGE_CONFIG_TO_SUPER_TILED : BLT_IMAGE_CONFIG_FROM_SUPER_TILED;
}
return BLT_IMAGE_CONFIG_CACHE_MODE(img->cache_mode) |
return BLT_IMAGE_CONFIG_TS_MODE(img->cache_mode) |
COND(img->use_ts, BLT_IMAGE_CONFIG_TS) |
COND(img->compressed, BLT_IMAGE_CONFIG_COMPRESSION) |
BLT_IMAGE_CONFIG_COMPRESSION_FORMAT(img->compress_fmt) |
@@ -182,7 +182,7 @@ emit_blt_inplace(struct etna_cmd_stream *stream, const struct blt_inplace_op *op
etna_cmd_stream_reserve(stream, 64*2); /* Never allow BLT sequences to be broken up */
etna_set_state(stream, VIVS_BLT_ENABLE, 0x00000001);
etna_set_state(stream, VIVS_BLT_CONFIG,
VIVS_BLT_CONFIG_INPLACE_CACHE_MODE(op->cache_mode) |
VIVS_BLT_CONFIG_INPLACE_TS_MODE(op->cache_mode) |
VIVS_BLT_CONFIG_INPLACE_BOTH |
(util_logbase2(op->bpp) << VIVS_BLT_CONFIG_INPLACE_BPP__SHIFT));
etna_set_state(stream, VIVS_BLT_DEST_TS_CLEAR_VALUE0, op->ts_clear_value[0]);
@@ -216,7 +216,7 @@ etna_blit_clear_color_blt(struct pipe_context *pctx, struct pipe_surface *dst,
clr.dest.compress_fmt = 3;
*/
clr.dest.tiling = res->layout;
clr.dest.cache_mode = TS_CACHE_MODE_128; /* TODO: cache modes */
clr.dest.cache_mode = TS_MODE_32; /* TODO: cache modes */
if (surf->surf.ts_size) {
clr.dest.use_ts = 1;
@@ -292,7 +292,7 @@ etna_blit_clear_zs_blt(struct pipe_context *pctx, struct pipe_surface *dst,
clr.dest.compress_fmt = COLOR_COMPRESSION_FORMAT_D24S8;
#endif
clr.dest.tiling = res->layout;
clr.dest.cache_mode = TS_CACHE_MODE_128; /* TODO: cache modes */
clr.dest.cache_mode = TS_MODE_32; /* TODO: cache modes */
if (surf->surf.ts_size) {
clr.dest.use_ts = 1;
@@ -434,7 +434,7 @@ etna_try_blt_blit(struct pipe_context *pctx,
op.ts_addr.flags = ETNA_RELOC_READ;
op.ts_clear_value[0] = src_lev->clear_value;
op.ts_clear_value[1] = src_lev->clear_value;
op.cache_mode = TS_CACHE_MODE_128; /* TODO: cache modes */
op.cache_mode = TS_MODE_32; /* TODO: cache modes */
op.num_tiles = src_lev->size / 128; /* TODO: cache modes */
op.bpp = util_format_get_blocksize(src->base.format);
@@ -451,7 +451,7 @@ etna_try_blt_blit(struct pipe_context *pctx,
op.src.format = translate_blt_format(src_format);
op.src.stride = src_lev->stride;
op.src.tiling = src->layout;
op.src.cache_mode = TS_CACHE_MODE_128; /* TODO: cache modes */
op.src.cache_mode = TS_MODE_32; /* TODO: cache modes */
const struct util_format_description *src_format_desc =
util_format_description(src_format);
for (unsigned x=0; x<4; ++x)
@@ -476,7 +476,7 @@ etna_try_blt_blit(struct pipe_context *pctx,
op.dest.compress_fmt = 3;
*/
op.dest.tiling = dst->layout;
op.dest.cache_mode = TS_CACHE_MODE_128; /* TODO cache modes */
op.dest.cache_mode = TS_MODE_32; /* TODO cache modes */
const struct util_format_description *dst_format_desc =
util_format_description(dst_format);
for (unsigned x=0; x<4; ++x)
src/gallium/drivers/etnaviv/etnaviv_format.c
+3 -3
View File
@@ -69,7 +69,7 @@ struct etna_format {
.vtx = FE_DATA_TYPE_##vtxfmt, \
.tex = TEXTURE_FORMAT_##texfmt, \
.rs = RS_FORMAT_##rsfmt, \
.ts = TS_SAMPLER_FORMAT_##tsfmt, \
.ts = COMPRESSION_FORMAT_##tsfmt, \
.present = 1, \
.tex_swiz = texswiz, \
}
@@ -80,7 +80,7 @@ struct etna_format {
.vtx = ETNA_NO_MATCH, \
.tex = TEXTURE_FORMAT_##fmt, \
.rs = RS_FORMAT_##rsfmt, \
.ts = TS_SAMPLER_FORMAT_##tsfmt, \
.ts = COMPRESSION_FORMAT_##tsfmt, \
.present = 1, \
.tex_swiz = swiz, \
}
@@ -180,7 +180,7 @@ static struct etna_format formats[PIPE_FORMAT_COUNT] = {
V_(R10G10B10A2_SSCALED, INT_10_10_10_2, NONE),
_T(X8Z24_UNORM, D24X8, SWIZ(X, Y, Z, W), A8R8G8B8, D24X8),
_T(S8_UINT_Z24_UNORM, D24X8, SWIZ(X, Y, Z, W), A8R8G8B8, D24X8),
_T(S8_UINT_Z24_UNORM, D24X8, SWIZ(X, Y, Z, W), A8R8G8B8, D24S8),
/* 48-bit */
V_(R16G16B16_UNORM, UNSIGNED_SHORT, NONE),
src/gallium/drivers/etnaviv/etnaviv_texture.c
+2 -2
View File
@@ -84,8 +84,8 @@ etna_configure_sampler_ts(struct etna_sampler_ts *sts, struct pipe_sampler_view
assert(rsc->ts_bo && lev->ts_valid);
sts->TS_SAMPLER_CONFIG =
VIVS_TS_SAMPLER_CONFIG_ENABLE(1) |
VIVS_TS_SAMPLER_CONFIG_FORMAT(translate_ts_sampler_format(rsc->base.format));
VIVS_TS_SAMPLER_CONFIG_ENABLE |
VIVS_TS_SAMPLER_CONFIG_COMPRESSION_FORMAT(translate_ts_sampler_format(rsc->base.format));
sts->TS_SAMPLER_CLEAR_VALUE = lev->clear_value;
sts->TS_SAMPLER_CLEAR_VALUE2 = lev->clear_value; /* To handle 64-bit formats this needs a different value */
sts->TS_SAMPLER_STATUS_BASE.bo = rsc->ts_bo;
src/gallium/drivers/etnaviv/etnaviv_translate.h
+7 -7
View File
@@ -281,19 +281,19 @@ translate_msaa_format(enum pipe_format fmt)
/* Note: Pipe format convention is LSB to MSB, VIVS is MSB to LSB */
switch (fmt) {
case PIPE_FORMAT_B4G4R4X4_UNORM:
return COLOR_COMPRESSION_FORMAT_A4R4G4B4;
return COMPRESSION_FORMAT_A4R4G4B4;
case PIPE_FORMAT_B4G4R4A4_UNORM:
return COLOR_COMPRESSION_FORMAT_A4R4G4B4;
return COMPRESSION_FORMAT_A4R4G4B4;
case PIPE_FORMAT_B5G5R5X1_UNORM:
return COLOR_COMPRESSION_FORMAT_A1R5G5B5;
return COMPRESSION_FORMAT_A1R5G5B5;
case PIPE_FORMAT_B5G5R5A1_UNORM:
return COLOR_COMPRESSION_FORMAT_A1R5G5B5;
return COMPRESSION_FORMAT_A1R5G5B5;
case PIPE_FORMAT_B5G6R5_UNORM:
return COLOR_COMPRESSION_FORMAT_R5G6B5;
return COMPRESSION_FORMAT_R5G6B5;
case PIPE_FORMAT_B8G8R8X8_UNORM:
return COLOR_COMPRESSION_FORMAT_X8R8G8B8;
return COMPRESSION_FORMAT_X8R8G8B8;
case PIPE_FORMAT_B8G8R8A8_UNORM:
return COLOR_COMPRESSION_FORMAT_A8R8G8B8;
return COMPRESSION_FORMAT_A8R8G8B8;
/* MSAA with YUYV not supported */
default:
return ETNA_NO_MATCH;
src/gallium/drivers/etnaviv/hw/common_3d.xml.h
+15 -12
View File
@@ -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:
- 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 ( 14781 bytes, from 2019-06-02 11:12:51)
- texdesc_3d.xml ( 3183 bytes, from 2019-06-10 23:29:22)
- copyright.xml ( 1597 bytes, from 2019-06-10 23:29:22)
- common.xml ( 35468 bytes, from 2019-06-10 23:29:22)
- common_3d.xml ( 14984 bytes, from 2019-07-01 19:47:22)
Copyright (C) 2012-2019 by the following authors:
- Wladimir J. van der Laan <laanwj@gmail.com>
@@ -125,16 +125,19 @@ DEALINGS IN THE SOFTWARE.
#define TEXTURE_HALIGN_SUPER_TILED 0x00000002
#define TEXTURE_HALIGN_SPLIT_TILED 0x00000003
#define TEXTURE_HALIGN_SPLIT_SUPER_TILED 0x00000004
#define TS_CACHE_MODE_128 0x00000000
#define TS_CACHE_MODE_256 0x00000001
#define TS_MODE_128B 0x00000000
#define TS_MODE_256B 0x00000001
#define TEXTURE_ADDRESSING_MODE_TILED 0x00000000
#define TEXTURE_ADDRESSING_MODE_LINEAR 0x00000003
#define COLOR_COMPRESSION_FORMAT_A4R4G4B4 0x00000000
#define COLOR_COMPRESSION_FORMAT_A1R5G5B5 0x00000001
#define COLOR_COMPRESSION_FORMAT_R5G6B5 0x00000002
#define COLOR_COMPRESSION_FORMAT_A8R8G8B8 0x00000003
#define COLOR_COMPRESSION_FORMAT_X8R8G8B8 0x00000004
#define COLOR_COMPRESSION_FORMAT_D24S8 0x00000005
#define COMPRESSION_FORMAT_A4R4G4B4 0x00000000
#define COMPRESSION_FORMAT_A1R5G5B5 0x00000001
#define COMPRESSION_FORMAT_R5G6B5 0x00000002
#define COMPRESSION_FORMAT_A8R8G8B8 0x00000003
#define COMPRESSION_FORMAT_X8R8G8B8 0x00000004
#define COMPRESSION_FORMAT_D24S8 0x00000005
#define COMPRESSION_FORMAT_D24X8 0x00000006
#define COMPRESSION_FORMAT_D16 0x00000008
#define COMPRESSION_FORMAT_NONE 0x0000000f
#define TEXTURE_FORMAT_ASTC_RGBA_4x4 0x00000000
#define TEXTURE_FORMAT_ASTC_RGBA_5x4 0x00000001
#define TEXTURE_FORMAT_ASTC_RGBA_5x5 0x00000002
src/gallium/drivers/etnaviv/hw/isa.xml.h
+6 -4
View File
@@ -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 ( 37079 bytes, from 2018-02-10 13:09:26)
- copyright.xml ( 1597 bytes, from 2018-02-10 13:09:26)
- isa.xml ( 37821 bytes, from 2019-06-30 15:02:03)
- copyright.xml ( 1597 bytes, from 2019-06-10 23:29:22)
Copyright (C) 2012-2018 by the following authors:
Copyright (C) 2012-2019 by the following authors:
- Wladimir J. van der Laan <laanwj@gmail.com>
- Christian Gmeiner <christian.gmeiner@gmail.com>
- Lucas Stach <l.stach@pengutronix.de>
@@ -185,6 +185,8 @@ DEALINGS IN THE SOFTWARE.
#define INST_RGROUP_INTERNAL 0x00000001
#define INST_RGROUP_UNIFORM_0 0x00000002
#define INST_RGROUP_UNIFORM_1 0x00000003
#define INST_RGROUP_TEMP_FP 0x00000004
#define INST_RGROUP_IMMEDIATE 0x00000007
#define INST_AMODE_DIRECT 0x00000000
#define INST_AMODE_ADD_A_X 0x00000001
#define INST_AMODE_ADD_A_Y 0x00000002
@@ -313,7 +315,7 @@ DEALINGS IN THE SOFTWARE.
#define VIV_ISA_WORD_3_SRC2_RGROUP__MASK 0x70000000
#define VIV_ISA_WORD_3_SRC2_RGROUP__SHIFT 28
#define VIV_ISA_WORD_3_SRC2_RGROUP(x) (((x) << VIV_ISA_WORD_3_SRC2_RGROUP__SHIFT) & VIV_ISA_WORD_3_SRC2_RGROUP__MASK)
#define VIV_ISA_WORD_3_UNK3_31 0x80000000
#define VIV_ISA_WORD_3_DST_FULL 0x80000000
#endif /* ISA_XML */
src/gallium/drivers/etnaviv/hw/state_3d.xml.h
+31 -39
View File
@@ -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 ( 26087 bytes, from 2018-02-10 13:09:26)
- common.xml ( 35468 bytes, from 2018-02-10 13:09:26)
- common_3d.xml ( 14781 bytes, from 2019-06-02 11:12:51)
- 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 ( 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)
- state.xml ( 26087 bytes, from 2019-06-10 23:29:22)
- common.xml ( 35468 bytes, from 2019-06-10 23:29:22)
- common_3d.xml ( 14984 bytes, from 2019-07-01 19:47:22)
- state_hi.xml ( 30232 bytes, from 2019-06-10 23:29:22)
- copyright.xml ( 1597 bytes, from 2019-06-10 23:29:22)
- state_2d.xml ( 51552 bytes, from 2019-06-10 23:29:22)
- state_3d.xml ( 79878 bytes, from 2019-07-01 19:47:36)
- state_blt.xml ( 13381 bytes, from 2019-07-01 19:46:55)
- state_vg.xml ( 5975 bytes, from 2019-06-10 23:29:22)
Copyright (C) 2012-2019 by the following authors:
- Wladimir J. van der Laan <laanwj@gmail.com>
@@ -122,14 +122,6 @@ 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)
@@ -1048,12 +1040,12 @@ DEALINGS IN THE SOFTWARE.
#define VIVS_PE_STENCIL_CONFIG_EXT2_WRITE_MASK_BACK(x) (((x) << VIVS_PE_STENCIL_CONFIG_EXT2_WRITE_MASK_BACK__SHIFT) & VIVS_PE_STENCIL_CONFIG_EXT2_WRITE_MASK_BACK__MASK)
#define VIVS_PE_MEM_CONFIG 0x000014bc
#define VIVS_PE_MEM_CONFIG_COLOR_CACHE_MODE__MASK 0x01000000
#define VIVS_PE_MEM_CONFIG_COLOR_CACHE_MODE__SHIFT 24
#define VIVS_PE_MEM_CONFIG_COLOR_CACHE_MODE(x) (((x) << VIVS_PE_MEM_CONFIG_COLOR_CACHE_MODE__SHIFT) & VIVS_PE_MEM_CONFIG_COLOR_CACHE_MODE__MASK)
#define VIVS_PE_MEM_CONFIG_DEPTH_CACHE_MODE__MASK 0x04000000
#define VIVS_PE_MEM_CONFIG_DEPTH_CACHE_MODE__SHIFT 26
#define VIVS_PE_MEM_CONFIG_DEPTH_CACHE_MODE(x) (((x) << VIVS_PE_MEM_CONFIG_DEPTH_CACHE_MODE__SHIFT) & VIVS_PE_MEM_CONFIG_DEPTH_CACHE_MODE__MASK)
#define VIVS_PE_MEM_CONFIG_COLOR_TS_MODE__MASK 0x01000000
#define VIVS_PE_MEM_CONFIG_COLOR_TS_MODE__SHIFT 24
#define VIVS_PE_MEM_CONFIG_COLOR_TS_MODE(x) (((x) << VIVS_PE_MEM_CONFIG_COLOR_TS_MODE__SHIFT) & VIVS_PE_MEM_CONFIG_COLOR_TS_MODE__MASK)
#define VIVS_PE_MEM_CONFIG_DEPTH_TS_MODE__MASK 0x04000000
#define VIVS_PE_MEM_CONFIG_DEPTH_TS_MODE__SHIFT 26
#define VIVS_PE_MEM_CONFIG_DEPTH_TS_MODE(x) (((x) << VIVS_PE_MEM_CONFIG_DEPTH_TS_MODE__SHIFT) & VIVS_PE_MEM_CONFIG_DEPTH_TS_MODE__MASK)
#define VIVS_PE_HALTI4_UNK014C0 0x000014c0
@@ -1283,7 +1275,7 @@ DEALINGS IN THE SOFTWARE.
#define VIVS_TS_MEM_CONFIG_COLOR_COMPRESSION_FORMAT(x) (((x) << VIVS_TS_MEM_CONFIG_COLOR_COMPRESSION_FORMAT__SHIFT) & VIVS_TS_MEM_CONFIG_COLOR_COMPRESSION_FORMAT__MASK)
#define VIVS_TS_MEM_CONFIG_UNK12 0x00001000
#define VIVS_TS_MEM_CONFIG_HDEPTH_AUTO_DISABLE 0x00002000
#define VIVS_TS_MEM_CONFIG_UNK14 0x00004000
#define VIVS_TS_MEM_CONFIG_STENCIL_ENABLE 0x00004000
#define VIVS_TS_MEM_CONFIG_UNK21 0x00200000
#define VIVS_TS_COLOR_STATUS_BASE 0x00001658
@@ -1315,12 +1307,11 @@ DEALINGS IN THE SOFTWARE.
#define VIVS_TS_SAMPLER__LEN 0x00000008
#define VIVS_TS_SAMPLER_CONFIG(i0) (0x00001720 + 0x4*(i0))
#define VIVS_TS_SAMPLER_CONFIG_ENABLE__MASK 0x00000003
#define VIVS_TS_SAMPLER_CONFIG_ENABLE__SHIFT 0
#define VIVS_TS_SAMPLER_CONFIG_ENABLE(x) (((x) << VIVS_TS_SAMPLER_CONFIG_ENABLE__SHIFT) & VIVS_TS_SAMPLER_CONFIG_ENABLE__MASK)
#define VIVS_TS_SAMPLER_CONFIG_FORMAT__MASK 0x000000f0
#define VIVS_TS_SAMPLER_CONFIG_FORMAT__SHIFT 4
#define VIVS_TS_SAMPLER_CONFIG_FORMAT(x) (((x) << VIVS_TS_SAMPLER_CONFIG_FORMAT__SHIFT) & VIVS_TS_SAMPLER_CONFIG_FORMAT__MASK)
#define VIVS_TS_SAMPLER_CONFIG_ENABLE 0x00000001
#define VIVS_TS_SAMPLER_CONFIG_COMPRESSION 0x00000002
#define VIVS_TS_SAMPLER_CONFIG_COMPRESSION_FORMAT__MASK 0x000000f0
#define VIVS_TS_SAMPLER_CONFIG_COMPRESSION_FORMAT__SHIFT 4
#define VIVS_TS_SAMPLER_CONFIG_COMPRESSION_FORMAT(x) (((x) << VIVS_TS_SAMPLER_CONFIG_COMPRESSION_FORMAT__SHIFT) & VIVS_TS_SAMPLER_CONFIG_COMPRESSION_FORMAT__MASK)
#define VIVS_TS_SAMPLER_CONFIG_UNK11__MASK 0x00003800
#define VIVS_TS_SAMPLER_CONFIG_UNK11__SHIFT 11
#define VIVS_TS_SAMPLER_CONFIG_UNK11(x) (((x) << VIVS_TS_SAMPLER_CONFIG_UNK11__SHIFT) & VIVS_TS_SAMPLER_CONFIG_UNK11__MASK)
@@ -1483,9 +1474,9 @@ DEALINGS IN THE SOFTWARE.
#define VIVS_TE_SAMPLER_CONFIG1_SWIZZLE_A__MASK 0x00700000
#define VIVS_TE_SAMPLER_CONFIG1_SWIZZLE_A__SHIFT 20
#define VIVS_TE_SAMPLER_CONFIG1_SWIZZLE_A(x) (((x) << VIVS_TE_SAMPLER_CONFIG1_SWIZZLE_A__SHIFT) & VIVS_TE_SAMPLER_CONFIG1_SWIZZLE_A__MASK)
#define VIVS_TE_SAMPLER_CONFIG1_CACHE_MODE__MASK 0x00800000
#define VIVS_TE_SAMPLER_CONFIG1_CACHE_MODE__SHIFT 23
#define VIVS_TE_SAMPLER_CONFIG1_CACHE_MODE(x) (((x) << VIVS_TE_SAMPLER_CONFIG1_CACHE_MODE__SHIFT) & VIVS_TE_SAMPLER_CONFIG1_CACHE_MODE__MASK)
#define VIVS_TE_SAMPLER_CONFIG1_TS_MODE__MASK 0x00800000
#define VIVS_TE_SAMPLER_CONFIG1_TS_MODE__SHIFT 23
#define VIVS_TE_SAMPLER_CONFIG1_TS_MODE(x) (((x) << VIVS_TE_SAMPLER_CONFIG1_TS_MODE__SHIFT) & VIVS_TE_SAMPLER_CONFIG1_TS_MODE__MASK)
#define VIVS_TE_SAMPLER_CONFIG1_TEXTURE_ARRAY 0x01000000
#define VIVS_TE_SAMPLER_CONFIG1_SEAMLESS_CUBE_MAP 0x02000000
#define VIVS_TE_SAMPLER_CONFIG1_HALIGN__MASK 0x1c000000
@@ -1606,9 +1597,9 @@ DEALINGS IN THE SOFTWARE.
#define VIVS_NTE_SAMPLER_CONFIG1_SWIZZLE_A__MASK 0x00700000
#define VIVS_NTE_SAMPLER_CONFIG1_SWIZZLE_A__SHIFT 20
#define VIVS_NTE_SAMPLER_CONFIG1_SWIZZLE_A(x) (((x) << VIVS_NTE_SAMPLER_CONFIG1_SWIZZLE_A__SHIFT) & VIVS_NTE_SAMPLER_CONFIG1_SWIZZLE_A__MASK)
#define VIVS_NTE_SAMPLER_CONFIG1_CACHE_MODE__MASK 0x00800000
#define VIVS_NTE_SAMPLER_CONFIG1_CACHE_MODE__SHIFT 23
#define VIVS_NTE_SAMPLER_CONFIG1_CACHE_MODE(x) (((x) << VIVS_NTE_SAMPLER_CONFIG1_CACHE_MODE__SHIFT) & VIVS_NTE_SAMPLER_CONFIG1_CACHE_MODE__MASK)
#define VIVS_NTE_SAMPLER_CONFIG1_TS_MODE__MASK 0x00800000
#define VIVS_NTE_SAMPLER_CONFIG1_TS_MODE__SHIFT 23
#define VIVS_NTE_SAMPLER_CONFIG1_TS_MODE(x) (((x) << VIVS_NTE_SAMPLER_CONFIG1_TS_MODE__SHIFT) & VIVS_NTE_SAMPLER_CONFIG1_TS_MODE__MASK)
#define VIVS_NTE_SAMPLER_CONFIG1_TEXTURE_ARRAY 0x01000000
#define VIVS_NTE_SAMPLER_CONFIG1_SEAMLESS_CUBE_MAP 0x02000000
#define VIVS_NTE_SAMPLER_CONFIG1_HALIGN__MASK 0x1c000000
@@ -1710,9 +1701,10 @@ DEALINGS IN THE SOFTWARE.
#define VIVS_NTE_DESCRIPTOR_ADDR(i0) (0x00015c00 + 0x4*(i0))
#define VIVS_NTE_DESCRIPTOR_TX_CTRL(i0) (0x00015e00 + 0x4*(i0))
#define VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_ENABLE__MASK 0x00000003
#define VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_ENABLE__SHIFT 0
#define VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_ENABLE(x) (((x) << VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_ENABLE__SHIFT) & VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_ENABLE__MASK)
#define VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_MODE__MASK 0x00000001
#define VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_MODE__SHIFT 0
#define VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_MODE(x) (((x) << VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_MODE__SHIFT) & VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_MODE__MASK)
#define VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_ENABLE 0x00000002
#define VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_INDEX__MASK 0x0000001c
#define VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_INDEX__SHIFT 2
#define VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_INDEX(x) (((x) << VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_INDEX__SHIFT) & VIVS_NTE_DESCRIPTOR_TX_CTRL_TS_INDEX__MASK)
src/gallium/drivers/etnaviv/hw/state_blt.xml.h
+16 -16
View File
@@ -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 ( 26087 bytes, from 2018-02-10 13:09:26)
- common.xml ( 35468 bytes, from 2018-02-10 13:09:26)
- common_3d.xml ( 14781 bytes, from 2019-06-02 11:12:51)
- 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 ( 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)
- state.xml ( 26087 bytes, from 2019-06-10 23:29:22)
- common.xml ( 35468 bytes, from 2019-06-10 23:29:22)
- common_3d.xml ( 14984 bytes, from 2019-07-01 19:47:22)
- state_hi.xml ( 30232 bytes, from 2019-06-10 23:29:22)
- copyright.xml ( 1597 bytes, from 2019-06-10 23:29:22)
- state_2d.xml ( 51552 bytes, from 2019-06-10 23:29:22)
- state_3d.xml ( 79878 bytes, from 2019-07-01 19:47:36)
- state_blt.xml ( 13381 bytes, from 2019-07-01 19:46:55)
- state_vg.xml ( 5975 bytes, from 2019-06-10 23:29:22)
Copyright (C) 2012-2018 by the following authors:
Copyright (C) 2012-2019 by the following authors:
- Wladimir J. van der Laan <laanwj@gmail.com>
- Christian Gmeiner <christian.gmeiner@gmail.com>
- Lucas Stach <l.stach@pengutronix.de>
@@ -72,9 +72,9 @@ DEALINGS IN THE SOFTWARE.
#define BLT_IMAGE_CONFIG_SWIZ_A__MASK 0x00018000
#define BLT_IMAGE_CONFIG_SWIZ_A__SHIFT 15
#define BLT_IMAGE_CONFIG_SWIZ_A(x) (((x) << BLT_IMAGE_CONFIG_SWIZ_A__SHIFT) & BLT_IMAGE_CONFIG_SWIZ_A__MASK)
#define BLT_IMAGE_CONFIG_CACHE_MODE__MASK 0x00020000
#define BLT_IMAGE_CONFIG_CACHE_MODE__SHIFT 17
#define BLT_IMAGE_CONFIG_CACHE_MODE(x) (((x) << BLT_IMAGE_CONFIG_CACHE_MODE__SHIFT) & BLT_IMAGE_CONFIG_CACHE_MODE__MASK)
#define BLT_IMAGE_CONFIG_TS_MODE__MASK 0x00020000
#define BLT_IMAGE_CONFIG_TS_MODE__SHIFT 17
#define BLT_IMAGE_CONFIG_TS_MODE(x) (((x) << BLT_IMAGE_CONFIG_TS_MODE__SHIFT) & BLT_IMAGE_CONFIG_TS_MODE__MASK)
#define BLT_IMAGE_CONFIG_FLIP_Y 0x00080000
#define BLT_IMAGE_CONFIG_FROM_SUPER_TILED 0x00200000
#define BLT_IMAGE_CONFIG_UNK22 0x00400000
@@ -183,9 +183,9 @@ DEALINGS IN THE SOFTWARE.
#define VIVS_BLT_CONFIG_CLEAR_BPP__MASK 0x00000380
#define VIVS_BLT_CONFIG_CLEAR_BPP__SHIFT 7
#define VIVS_BLT_CONFIG_CLEAR_BPP(x) (((x) << VIVS_BLT_CONFIG_CLEAR_BPP__SHIFT) & VIVS_BLT_CONFIG_CLEAR_BPP__MASK)
#define VIVS_BLT_CONFIG_INPLACE_CACHE_MODE__MASK 0x00000400
#define VIVS_BLT_CONFIG_INPLACE_CACHE_MODE__SHIFT 10
#define VIVS_BLT_CONFIG_INPLACE_CACHE_MODE(x) (((x) << VIVS_BLT_CONFIG_INPLACE_CACHE_MODE__SHIFT) & VIVS_BLT_CONFIG_INPLACE_CACHE_MODE__MASK)
#define VIVS_BLT_CONFIG_INPLACE_TS_MODE__MASK 0x00000400
#define VIVS_BLT_CONFIG_INPLACE_TS_MODE__SHIFT 10
#define VIVS_BLT_CONFIG_INPLACE_TS_MODE(x) (((x) << VIVS_BLT_CONFIG_INPLACE_TS_MODE__SHIFT) & VIVS_BLT_CONFIG_INPLACE_TS_MODE__MASK)
#define VIVS_BLT_CONFIG_INPLACE_BOTH 0x00000800
#define VIVS_BLT_CONFIG_INPLACE_BPP__MASK 0x00038000
#define VIVS_BLT_CONFIG_INPLACE_BPP__SHIFT 15
src/gallium/drivers/etnaviv/hw/texdesc_3d.xml.h
+8 -8
View File
@@ -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 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 ( 14781 bytes, from 2019-06-02 11:12:51)
- texdesc_3d.xml ( 3183 bytes, from 2019-06-10 23:29:22)
- copyright.xml ( 1597 bytes, from 2019-06-10 23:29:22)
- common.xml ( 35468 bytes, from 2019-06-10 23:29:22)
- common_3d.xml ( 14984 bytes, from 2019-07-01 19:47:22)
Copyright (C) 2012-2018 by the following authors:
Copyright (C) 2012-2019 by the following authors:
- Wladimir J. van der Laan <laanwj@gmail.com>
- Christian Gmeiner <christian.gmeiner@gmail.com>
- Lucas Stach <l.stach@pengutronix.de>
@@ -103,9 +103,9 @@ DEALINGS IN THE SOFTWARE.
#define TEXDESC_CONFIG1_SWIZZLE_A__MASK 0x00700000
#define TEXDESC_CONFIG1_SWIZZLE_A__SHIFT 20
#define TEXDESC_CONFIG1_SWIZZLE_A(x) (((x) << TEXDESC_CONFIG1_SWIZZLE_A__SHIFT) & TEXDESC_CONFIG1_SWIZZLE_A__MASK)
#define TEXDESC_CONFIG1_CACHE_MODE__MASK 0x00800000
#define TEXDESC_CONFIG1_CACHE_MODE__SHIFT 23
#define TEXDESC_CONFIG1_CACHE_MODE(x) (((x) << TEXDESC_CONFIG1_CACHE_MODE__SHIFT) & TEXDESC_CONFIG1_CACHE_MODE__MASK)
#define TEXDESC_CONFIG1_TS_MODE__MASK 0x00800000
#define TEXDESC_CONFIG1_TS_MODE__SHIFT 23
#define TEXDESC_CONFIG1_TS_MODE(x) (((x) << TEXDESC_CONFIG1_TS_MODE__SHIFT) & TEXDESC_CONFIG1_TS_MODE__MASK)
#define TEXDESC_CONFIG1_TEXTURE_ARRAY 0x01000000
#define TEXDESC_CONFIG1_SEAMLESS_CUBE_MAP 0x02000000
#define TEXDESC_CONFIG1_HALIGN__MASK 0x1c000000