Update header files from rnndb
Signed-off-by: Wladimir J. van der Laan <laanwj@gmail.com>
diff --git a/src/bltdemo_gc7000.c b/src/bltdemo_gc7000.c
index 596fb26..b93cb0d 100644
--- a/src/bltdemo_gc7000.c
+++ b/src/bltdemo_gc7000.c
@@ -12,6 +12,7 @@
#include "etna_fb.h"
#include "etna_util.h"
+#include "hw/common_3d.xml.h"
#include "hw/state.xml.h"
#include "hw/state_3d.xml.h"
#include "hw/state_blt.xml.h"
@@ -155,7 +156,7 @@
VIVS_BLT_DEST_STRIDE_FORMAT(BLT_FORMAT_A4R4G4B4) |
VIVS_BLT_DEST_STRIDE_STRIDE(op->stride);
uint32_t img_config_bits =
- BLT_IMAGE_CONFIG_CACHE_MODE_256 |
+ BLT_IMAGE_CONFIG_CACHE_MODE(TS_CACHE_MODE_256) |
COND(op->use_ts, BLT_IMAGE_CONFIG_TS) |
COND(op->compressed, BLT_IMAGE_CONFIG_COMPRESSION) |
BLT_IMAGE_CONFIG_COMPRESSION_FORMAT(op->compress_fmt);
@@ -169,17 +170,17 @@
assert(op->bpp);
etna_set_state(stream, VIVS_BLT_CONFIG, VIVS_BLT_CONFIG_CLEAR_BPP(op->bpp-1));
etna_set_state(stream, VIVS_BLT_DEST_STRIDE, stride_bits);
- etna_set_state(stream, VIVS_BLT_DEST_CONFIG, img_config_bits | BLT_IMAGE_CONFIG_TO_SUPERTILED);
+ etna_set_state(stream, VIVS_BLT_DEST_CONFIG, img_config_bits | BLT_IMAGE_CONFIG_TO_SUPER_TILED);
etna_set_state_reloc(stream, VIVS_BLT_DEST_ADDR, &op->addr);
etna_set_state(stream, VIVS_BLT_SRC_STRIDE, stride_bits);
- etna_set_state(stream, VIVS_BLT_SRC_CONFIG, img_config_bits | BLT_IMAGE_CONFIG_FROM_SUPERTILED);
+ etna_set_state(stream, VIVS_BLT_SRC_CONFIG, img_config_bits | BLT_IMAGE_CONFIG_FROM_SUPER_TILED);
etna_set_state_reloc(stream, VIVS_BLT_SRC_ADDR, &op->addr);
etna_set_state(stream, VIVS_BLT_DEST_POS, VIVS_BLT_DEST_POS_X(op->rect_x) | VIVS_BLT_DEST_POS_Y(op->rect_y));
etna_set_state(stream, VIVS_BLT_IMAGE_SIZE, VIVS_BLT_IMAGE_SIZE_WIDTH(op->rect_w) | VIVS_BLT_IMAGE_SIZE_HEIGHT(op->rect_h));
etna_set_state(stream, VIVS_BLT_CLEAR_COLOR0, op->clear_value[0]);
etna_set_state(stream, VIVS_BLT_CLEAR_COLOR1, op->clear_value[1]);
- etna_set_state(stream, VIVS_BLT_UNK1404C, 0xffffffff);
- etna_set_state(stream, VIVS_BLT_UNK14050, 0xffffffff);
+ etna_set_state(stream, VIVS_BLT_SRC_TS_CLEAR_VALUE0, 0xffffffff);
+ etna_set_state(stream, VIVS_BLT_SRC_TS_CLEAR_VALUE1, 0xffffffff);
if (op->use_ts) {
etna_set_state_reloc(stream, VIVS_BLT_DEST_TS, &op->ts_addr);
etna_set_state_reloc(stream, VIVS_BLT_SRC_TS, &op->ts_addr);
diff --git a/src/cube_gc7000.c b/src/cube_gc7000.c
index a34e4a3..f990296 100644
--- a/src/cube_gc7000.c
+++ b/src/cube_gc7000.c
@@ -297,8 +297,8 @@
etna_set_state(stream, VIVS_BLT_IMAGE_SIZE, 0x04380780);
etna_set_state(stream, VIVS_BLT_CLEAR_COLOR0, 0xff808080);
etna_set_state(stream, VIVS_BLT_CLEAR_COLOR1, 0xff808080);
- etna_set_state(stream, VIVS_BLT_UNK1404C, 0xffffffff);
- etna_set_state(stream, VIVS_BLT_UNK14050, 0xffffffff);
+ etna_set_state(stream, VIVS_BLT_CLEAR_BITS0, 0xffffffff);
+ etna_set_state(stream, VIVS_BLT_CLEAR_BITS1, 0xffffffff);
etna_set_state_reloc(stream, VIVS_BLT_DEST_TS, &info->ADDR_TILE_STATUS_B);
etna_set_state_reloc(stream, VIVS_BLT_SRC_TS, &info->ADDR_TILE_STATUS_B);
etna_set_state(stream, VIVS_BLT_DEST_TS_CLEAR_VALUE0, 0xff808080);
diff --git a/src/hw/common.xml.h b/src/hw/common.xml.h
index b85bd8a..8f93f2b 100644
--- a/src/hw/common.xml.h
+++ b/src/hw/common.xml.h
@@ -11,7 +11,7 @@
- texdesc_3d.xml ( 3146 bytes, from 2017-10-13 12:18:33)
- copyright.xml ( 1597 bytes, from 2016-10-29 07:29:22)
- common.xml ( 26193 bytes, from 2017-10-13 12:18:24)
-- common_3d.xml ( 12531 bytes, from 2017-10-13 11:04:24)
+- common_3d.xml ( 12636 bytes, from 2017-10-16 13:56:34)
Copyright (C) 2012-2017 by the following authors:
- Wladimir J. van der Laan <laanwj@gmail.com>
diff --git a/src/hw/common_3d.xml.h b/src/hw/common_3d.xml.h
index 1832655..ef0409d 100644
--- a/src/hw/common_3d.xml.h
+++ b/src/hw/common_3d.xml.h
@@ -11,7 +11,7 @@
- texdesc_3d.xml ( 3146 bytes, from 2017-10-13 12:18:33)
- copyright.xml ( 1597 bytes, from 2016-10-29 07:29:22)
- common.xml ( 26193 bytes, from 2017-10-13 12:18:24)
-- common_3d.xml ( 12531 bytes, from 2017-10-13 11:04:24)
+- common_3d.xml ( 12636 bytes, from 2017-10-16 13:56:34)
Copyright (C) 2012-2017 by the following authors:
- Wladimir J. van der Laan <laanwj@gmail.com>
@@ -57,7 +57,7 @@
#define TEXTURE_FORMAT_YUY2 0x0000000e
#define TEXTURE_FORMAT_UYVY 0x0000000f
#define TEXTURE_FORMAT_D16 0x00000010
-#define TEXTURE_FORMAT_D24S8 0x00000011
+#define TEXTURE_FORMAT_D24X8 0x00000011
#define TEXTURE_FORMAT_DXT1 0x00000013
#define TEXTURE_FORMAT_DXT2_DXT3 0x00000014
#define TEXTURE_FORMAT_DXT4_DXT5 0x00000015
@@ -125,11 +125,14 @@
#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 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 TE_SAMPLER_CONFIG2_UNK16 0x00010000
#define TE_SAMPLER_CONFIG2_UNK17 0x00020000
#define TE_SAMPLER_CONFIG2_UNK18 0x00040000
diff --git a/src/hw/state.xml.h b/src/hw/state.xml.h
index 94adff7..a58361c 100644
--- a/src/hw/state.xml.h
+++ b/src/hw/state.xml.h
@@ -10,12 +10,12 @@
The rules-ng-ng source files this header was generated from are:
- state.xml ( 25532 bytes, from 2017-10-13 12:19:04)
- common.xml ( 26193 bytes, from 2017-10-13 12:18:24)
-- common_3d.xml ( 12531 bytes, from 2017-10-13 11:04:24)
+- common_3d.xml ( 12636 bytes, from 2017-10-16 13:56:34)
- 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 ( 74317 bytes, from 2017-10-13 12:43:31)
-- state_blt.xml ( 11153 bytes, from 2017-10-13 12:39:38)
+- state_blt.xml ( 13353 bytes, from 2017-10-16 17:02:43)
- state_vg.xml ( 5975 bytes, from 2016-10-29 07:29:22)
Copyright (C) 2012-2017 by the following authors:
diff --git a/src/hw/state_2d.xml.h b/src/hw/state_2d.xml.h
index 7e4e12e..46d9c4d 100644
--- a/src/hw/state_2d.xml.h
+++ b/src/hw/state_2d.xml.h
@@ -10,12 +10,12 @@
The rules-ng-ng source files this header was generated from are:
- state.xml ( 25532 bytes, from 2017-10-13 12:19:04)
- common.xml ( 26193 bytes, from 2017-10-13 12:18:24)
-- common_3d.xml ( 12531 bytes, from 2017-10-13 11:04:24)
+- common_3d.xml ( 12636 bytes, from 2017-10-16 13:56:34)
- 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 ( 74317 bytes, from 2017-10-13 12:43:31)
-- state_blt.xml ( 11153 bytes, from 2017-10-13 12:39:38)
+- state_blt.xml ( 13353 bytes, from 2017-10-16 17:02:43)
- state_vg.xml ( 5975 bytes, from 2016-10-29 07:29:22)
Copyright (C) 2012-2016 by the following authors:
diff --git a/src/hw/state_3d.xml.h b/src/hw/state_3d.xml.h
index a9d5bfd..887033f 100644
--- a/src/hw/state_3d.xml.h
+++ b/src/hw/state_3d.xml.h
@@ -10,12 +10,12 @@
The rules-ng-ng source files this header was generated from are:
- state.xml ( 25532 bytes, from 2017-10-13 12:19:04)
- common.xml ( 26193 bytes, from 2017-10-13 12:18:24)
-- common_3d.xml ( 12531 bytes, from 2017-10-13 11:04:24)
+- common_3d.xml ( 12636 bytes, from 2017-10-16 13:56:34)
- 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 ( 74317 bytes, from 2017-10-13 12:43:31)
-- state_blt.xml ( 11153 bytes, from 2017-10-13 12:39:38)
+- state_blt.xml ( 13353 bytes, from 2017-10-16 17:02:43)
- state_vg.xml ( 5975 bytes, from 2016-10-29 07:29:22)
Copyright (C) 2012-2017 by the following authors:
@@ -1387,8 +1387,7 @@
#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_128 0x00000000
-#define VIVS_TE_SAMPLER_CONFIG1_CACHE_MODE_256 0x00800000
+#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_TEXTURE_ARRAY 0x01000000
#define VIVS_TE_SAMPLER_CONFIG1_UNK25 0x02000000
#define VIVS_TE_SAMPLER_CONFIG1_HALIGN__MASK 0x1c000000
@@ -1506,8 +1505,7 @@
#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_128 0x00000000
-#define VIVS_NTE_SAMPLER_CONFIG1_CACHE_MODE_256 0x00800000
+#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_TEXTURE_ARRAY 0x01000000
#define VIVS_NTE_SAMPLER_CONFIG1_UNK25 0x02000000
#define VIVS_NTE_SAMPLER_CONFIG1_HALIGN__MASK 0x1c000000
diff --git a/src/hw/state_blt.xml.h b/src/hw/state_blt.xml.h
index 4958b74..885d285 100644
--- a/src/hw/state_blt.xml.h
+++ b/src/hw/state_blt.xml.h
@@ -10,12 +10,12 @@
The rules-ng-ng source files this header was generated from are:
- state.xml ( 25532 bytes, from 2017-10-13 12:19:04)
- common.xml ( 26193 bytes, from 2017-10-13 12:18:24)
-- common_3d.xml ( 12531 bytes, from 2017-10-13 11:04:24)
+- common_3d.xml ( 12636 bytes, from 2017-10-16 13:56:34)
- 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 ( 74317 bytes, from 2017-10-13 12:43:31)
-- state_blt.xml ( 11153 bytes, from 2017-10-13 12:39:38)
+- state_blt.xml ( 13353 bytes, from 2017-10-16 17:02:43)
- state_vg.xml ( 5975 bytes, from 2016-10-29 07:29:22)
Copyright (C) 2012-2017 by the following authors:
@@ -46,8 +46,9 @@
#define BLT_TILING_LINEAR 0x00000000
-#define BLT_TILING_SUPERTILED 0x00000003
+#define BLT_TILING_SUPER_TILED 0x00000003
#define BLT_FORMAT_A4R4G4B4 0x00000001
+#define BLT_FORMAT_X8R8G8B8 0x00000005
#define BLT_FORMAT_A8R8G8B8 0x00000006
#define BLT_FORMAT_A16R16G16B16 0x0000001c
#define BLT_FORMAT_R8G8B8 0x00000022
@@ -73,12 +74,11 @@
#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_128 0x00000000
-#define BLT_IMAGE_CONFIG_CACHE_MODE_256 0x00020000
+#define BLT_IMAGE_CONFIG_CACHE_MODE(x) (((x) << BLT_IMAGE_CONFIG_CACHE_MODE__SHIFT) & BLT_IMAGE_CONFIG_CACHE_MODE__MASK)
#define BLT_IMAGE_CONFIG_FLIP_Y 0x00080000
-#define BLT_IMAGE_CONFIG_FROM_SUPERTILED 0x00200000
+#define BLT_IMAGE_CONFIG_FROM_SUPER_TILED 0x00200000
#define BLT_IMAGE_CONFIG_UNK22 0x00400000
-#define BLT_IMAGE_CONFIG_TO_SUPERTILED 0x04000000
+#define BLT_IMAGE_CONFIG_TO_SUPER_TILED 0x04000000
#define VIVS_BLT 0x00000000
#define VIVS_BLT_SRC_ADDR 0x00014000
@@ -151,9 +151,9 @@
#define VIVS_BLT_CLEAR_COLOR1 0x00014048
-#define VIVS_BLT_UNK1404C 0x0001404c
+#define VIVS_BLT_CLEAR_BITS0 0x0001404c
-#define VIVS_BLT_UNK14050 0x00014050
+#define VIVS_BLT_CLEAR_BITS1 0x00014050
#define VIVS_BLT_BUFFER_SIZE 0x00014054
@@ -167,6 +167,7 @@
#define VIVS_BLT_COMMAND_COMMAND_CLEAR_IMAGE 0x00000001
#define VIVS_BLT_COMMAND_COMMAND_COPY_IMAGE 0x00000002
#define VIVS_BLT_COMMAND_COMMAND_COPY_BUFFER 0x00000003
+#define VIVS_BLT_COMMAND_COMMAND_INPLACE 0x00000004
#define VIVS_BLT_COMMAND_COMMAND_YUV_TILE 0x00000005
#define VIVS_BLT_COMMAND_COMMAND_GEN_MIPMAPS 0x00000006
@@ -182,6 +183,19 @@
#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_BOTH 0x00000800
+#define VIVS_BLT_CONFIG_INPLACE_BPP__MASK 0x00038000
+#define VIVS_BLT_CONFIG_INPLACE_BPP__SHIFT 15
+#define VIVS_BLT_CONFIG_INPLACE_BPP_1 0x00000000
+#define VIVS_BLT_CONFIG_INPLACE_BPP_2 0x00008000
+#define VIVS_BLT_CONFIG_INPLACE_BPP_4 0x00010000
+#define VIVS_BLT_CONFIG_INPLACE_BPP_8 0x00018000
+#define VIVS_BLT_CONFIG_INPLACE_BPP_16 0x00020000
+
+#define VIVS_BLT_INPLACE_TILE_COUNT 0x00014068
#define VIVS_BLT_YUV 0x00000000
@@ -215,7 +229,11 @@
#define VIVS_BLT_SET_COMMAND 0x000140ac
-#define VIVS_BLT_UNK140B0 0x000140b0
+#define VIVS_BLT_MIPMAP_CONFIG 0x000140b0
+#define VIVS_BLT_MIPMAP_CONFIG_NUM__MASK 0x0000001f
+#define VIVS_BLT_MIPMAP_CONFIG_NUM__SHIFT 0
+#define VIVS_BLT_MIPMAP_CONFIG_NUM(x) (((x) << VIVS_BLT_MIPMAP_CONFIG_NUM__SHIFT) & VIVS_BLT_MIPMAP_CONFIG_NUM__MASK)
+#define VIVS_BLT_MIPMAP_CONFIG_UNK5 0x00000020
#define VIVS_BLT_FENCE_OUT_DATA_HIGH 0x000140b4
diff --git a/src/hw/state_hi.xml.h b/src/hw/state_hi.xml.h
index 487bf63..89eabde 100644
--- a/src/hw/state_hi.xml.h
+++ b/src/hw/state_hi.xml.h
@@ -10,12 +10,12 @@
The rules-ng-ng source files this header was generated from are:
- state.xml ( 25532 bytes, from 2017-10-13 12:19:04)
- common.xml ( 26193 bytes, from 2017-10-13 12:18:24)
-- common_3d.xml ( 12531 bytes, from 2017-10-13 11:04:24)
+- common_3d.xml ( 12636 bytes, from 2017-10-16 13:56:34)
- 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 ( 74317 bytes, from 2017-10-13 12:43:31)
-- state_blt.xml ( 11153 bytes, from 2017-10-13 12:39:38)
+- state_blt.xml ( 13353 bytes, from 2017-10-16 17:02:43)
- state_vg.xml ( 5975 bytes, from 2016-10-29 07:29:22)
Copyright (C) 2012-2017 by the following authors:
diff --git a/src/hw/state_vg.xml.h b/src/hw/state_vg.xml.h
index 3f9aac7..ffff426 100644
--- a/src/hw/state_vg.xml.h
+++ b/src/hw/state_vg.xml.h
@@ -10,12 +10,12 @@
The rules-ng-ng source files this header was generated from are:
- state.xml ( 25532 bytes, from 2017-10-13 12:19:04)
- common.xml ( 26193 bytes, from 2017-10-13 12:18:24)
-- common_3d.xml ( 12531 bytes, from 2017-10-13 11:04:24)
+- common_3d.xml ( 12636 bytes, from 2017-10-16 13:56:34)
- 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 ( 74317 bytes, from 2017-10-13 12:43:31)
-- state_blt.xml ( 11153 bytes, from 2017-10-13 12:39:38)
+- state_blt.xml ( 13353 bytes, from 2017-10-16 17:02:43)
- state_vg.xml ( 5975 bytes, from 2016-10-29 07:29:22)
Copyright (C) 2012-2016 by the following authors:
diff --git a/src/hw/texdesc_3d.xml.h b/src/hw/texdesc_3d.xml.h
index 1f80382..7582e1f 100644
--- a/src/hw/texdesc_3d.xml.h
+++ b/src/hw/texdesc_3d.xml.h
@@ -11,7 +11,7 @@
- texdesc_3d.xml ( 3146 bytes, from 2017-10-13 12:18:33)
- copyright.xml ( 1597 bytes, from 2016-10-29 07:29:22)
- common.xml ( 26193 bytes, from 2017-10-13 12:18:24)
-- common_3d.xml ( 12531 bytes, from 2017-10-13 11:04:24)
+- common_3d.xml ( 12636 bytes, from 2017-10-16 13:56:34)
Copyright (C) 2012-2017 by the following authors:
- Wladimir J. van der Laan <laanwj@gmail.com>
@@ -102,8 +102,7 @@
#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_128 0x00000000
-#define TEXDESC_CONFIG1_CACHE_MODE_256 0x00800000
+#define TEXDESC_CONFIG1_CACHE_MODE(x) (((x) << TEXDESC_CONFIG1_CACHE_MODE__SHIFT) & TEXDESC_CONFIG1_CACHE_MODE__MASK)
#define TEXDESC_CONFIG1_TEXTURE_ARRAY 0x01000000
#define TEXDESC_CONFIG1_UNK25 0x02000000
#define TEXDESC_CONFIG1_HALIGN__MASK 0x1c000000
