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

anv/state: Replace a bunch of ANV_GEN with GEN_GEN

Browse Source
This commit is contained in:
Jason Ekstrand
2016-02-22 19:19:00 -08:00
parent 442dff8cf4
commit ae619a0355
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/intel/vulkan/gen8_state.c
View File

@@ -44,7 +44,7 @@ genX(init_device_state)(struct anv_device *device)
batch.end = (void *) cmds + sizeof(cmds); batch.end = (void *) cmds + sizeof(cmds);
anv_batch_emit(&batch, GENX(PIPELINE_SELECT), anv_batch_emit(&batch, GENX(PIPELINE_SELECT),
#if ANV_GEN >= 9 #if GEN_GEN >= 9
.MaskBits = 3, .MaskBits = 3,
#endif #endif
.PipelineSelection = _3D); .PipelineSelection = _3D);
@@ -93,7 +93,7 @@ genX(init_device_state)(struct anv_device *device)
._8xSample6YOffset = 0.9375, ._8xSample6YOffset = 0.9375,
._8xSample7XOffset = 0.9375, ._8xSample7XOffset = 0.9375,
._8xSample7YOffset = 0.0625, ._8xSample7YOffset = 0.0625,
#if ANV_GEN >= 9 #if GEN_GEN >= 9
._16xSample0XOffset = 0.5625, ._16xSample0XOffset = 0.5625,
._16xSample0YOffset = 0.5625, ._16xSample0YOffset = 0.5625,
._16xSample1XOffset = 0.4375, ._16xSample1XOffset = 0.4375,
@@ -194,7 +194,7 @@ static const uint8_t anv_valign[] = {
static void static void
get_halign_valign(const struct isl_surf *surf, uint32_t *halign, uint32_t *valign) get_halign_valign(const struct isl_surf *surf, uint32_t *halign, uint32_t *valign)
{ {
#if ANV_GENx10 >= 90 #if GEN_GEN >= 9
if (isl_tiling_is_std_y(surf->tiling) || if (isl_tiling_is_std_y(surf->tiling) ||
surf->dim_layout == ISL_DIM_LAYOUT_GEN9_1D) { surf->dim_layout == ISL_DIM_LAYOUT_GEN9_1D) {
/* The hardware ignores the alignment values. Anyway, the surface's /* The hardware ignores the alignment values. Anyway, the surface's
@@ -239,7 +239,7 @@ get_qpitch(const struct isl_surf *surf)
default: default:
unreachable(!"bad isl_surf_dim"); unreachable(!"bad isl_surf_dim");
case ISL_SURF_DIM_1D: case ISL_SURF_DIM_1D:
#if ANV_GENx10 >= 90 #if GEN_GEN >= 9
/* QPitch is usually expressed as rows of surface elements (where /* QPitch is usually expressed as rows of surface elements (where
* a surface element is an compression block or a single surface * a surface element is an compression block or a single surface
* sample). Skylake 1D is an outlier. * sample). Skylake 1D is an outlier.
@@ -256,7 +256,7 @@ get_qpitch(const struct isl_surf *surf)
#endif #endif
case ISL_SURF_DIM_2D: case ISL_SURF_DIM_2D:
case ISL_SURF_DIM_3D: case ISL_SURF_DIM_3D:
#if ANV_GEN >= 9 #if GEN_GEN >= 9
return isl_surf_get_array_pitch_el_rows(surf); return isl_surf_get_array_pitch_el_rows(surf);
#else #else
/* From the Broadwell PRM for RENDER_SURFACE_STATE.QPitch /* From the Broadwell PRM for RENDER_SURFACE_STATE.QPitch
@@ -452,7 +452,7 @@ VkResult genX(CreateSampler)(
.SamplerDisable = false, .SamplerDisable = false,
.TextureBorderColorMode = DX10OGL, .TextureBorderColorMode = DX10OGL,
.LODPreClampMode = CLAMP_MODE_OGL, .LODPreClampMode = CLAMP_MODE_OGL,
#if ANV_GEN == 8 #if GEN_GEN == 8
.BaseMipLevel = 0.0, .BaseMipLevel = 0.0,
#endif #endif
.MipModeFilter = vk_to_gen_mipmap_mode[pCreateInfo->mipmapMode], .MipModeFilter = vk_to_gen_mipmap_mode[pCreateInfo->mipmapMode],