OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

isl: Rename legacy Y tiling to ISL_TILING_Y0

Browse Source 
Rename legacy Y tiling from ISL_TILING_Y to ISL_TILING_Y0 in order to
clearly distinguish it from Yf and Ys.  Using ISL_TILING_Y to denote
legacy Y tiling would lead to confusion with i965, because i965 uses
I195_TILE_Y to denote *any* Y tiling.
This commit is contained in:
Chad Versace
2015-12-02 09:14:48 -08:00
parent 57941b61ab
commit bda43a0f59
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vulkan/anv_image.c
View File

@@ -100,7 +100,7 @@ static const struct anv_tile_info {
} anv_tile_info_table[] = {
[ISL_TILING_LINEAR] = { 64 },
[ISL_TILING_X] = { 4096 },
[ISL_TILING_Y] = { 4096 },
[ISL_TILING_Y0] = { 4096 },
[ISL_TILING_Yf] = { 4096 },
[ISL_TILING_Ys] = { 4096 },
[ISL_TILING_W] = { 4096 },
@@ -124,7 +124,7 @@ anv_image_choose_tiling(const struct anv_image_create_info *anv_info)
if (unlikely(anv_info->vk_info->format == VK_FORMAT_S8_UINT)) {
return ISL_TILING_W;
} else {
return ISL_TILING_Y;
return ISL_TILING_Y0;
}
default:
assert(!"bad VKImageTiling");

2
src/vulkan/gen7_state.c
View File

@@ -249,7 +249,7 @@ genX(image_view_init)(struct anv_image_view *iview,
* Tiled Surface is False."
*/
.TiledSurface = surface->tiling != ISL_TILING_LINEAR,
.TileWalk = surface->tiling == ISL_TILING_Y ?
.TileWalk = surface->tiling == ISL_TILING_Y0 ?
TILEWALK_YMAJOR : TILEWALK_XMAJOR,
.VerticalLineStride = 0,

2
src/vulkan/gen8_state.c
View File

@@ -177,7 +177,7 @@ genX(image_view_init)(struct anv_image_view *iview,
static const uint8_t isl_to_gen_tiling[] = {
[ISL_TILING_LINEAR] = LINEAR,
[ISL_TILING_X] = XMAJOR,
[ISL_TILING_Y] = YMAJOR,
[ISL_TILING_Y0] = YMAJOR,
[ISL_TILING_Yf] = YMAJOR,
[ISL_TILING_Ys] = YMAJOR,
[ISL_TILING_W] = WMAJOR,

4
src/vulkan/isl.c
View File

@@ -56,7 +56,7 @@ isl_tiling_get_extent(const struct isl_device *dev,
static const struct isl_extent2d legacy_extents[] = {
[ISL_TILING_LINEAR] = { 1, 1 },
[ISL_TILING_X] = { 512, 8 },
[ISL_TILING_Y] = { 128, 32 },
[ISL_TILING_Y0] = { 128, 32 },
[ISL_TILING_W] = { 128, 32 },
};
@@ -74,7 +74,7 @@ isl_tiling_get_extent(const struct isl_device *dev,
switch (tiling) {
case ISL_TILING_LINEAR:
case ISL_TILING_X:
case ISL_TILING_Y:
case ISL_TILING_Y0:
case ISL_TILING_W:
*e = legacy_extents[tiling];
return;

5
src/vulkan/isl.h
View File

@@ -40,12 +40,15 @@ struct brw_device_info;
/**
* WARNING: These values differ from the hardware enum values, which are
* unstable across hardware generations.
*
* Note that legacy Y tiling is ISL_TILING_Y0 instead of ISL_TILING_Y, to
* clearly distinguish it from Yf and Ys.
*/
enum isl_tiling {
ISL_TILING_LINEAR,
ISL_TILING_W,
ISL_TILING_X,
ISL_TILING_Y, /**< Legacy Y tiling */
ISL_TILING_Y0, /**< Legacy Y tiling */
ISL_TILING_Yf,
ISL_TILING_Ys,
};