diff options
Diffstat (limited to 'src/amd')
| -rw-r--r-- | src/amd/common/ac_surface.c | 6 | ||||
| -rw-r--r-- | src/amd/common/ac_surface.h | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_image.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c index 959e7b3d735..afdae1971e9 100644 --- a/src/amd/common/ac_surface.c +++ b/src/amd/common/ac_surface.c @@ -262,7 +262,7 @@ static int surf_config_sanity(const struct ac_surf_config *config, } if (!(flags & RADEON_SURF_Z_OR_SBUFFER)) { - switch (config->info.color_samples) { + switch (config->info.storage_samples) { case 0: case 1: case 2: @@ -694,7 +694,7 @@ static int gfx6_compute_surface(ADDR_HANDLE addrlib, if (!(surf->flags & RADEON_SURF_Z_OR_SBUFFER)) { AddrDccIn.numSamples = AddrSurfInfoIn.numFrags = - MAX2(1, config->info.color_samples); + MAX2(1, config->info.storage_samples); } /* Set the micro tile type. */ @@ -1433,7 +1433,7 @@ static int gfx9_compute_surface(ADDR_HANDLE addrlib, AddrSurfInfoIn.numFrags = AddrSurfInfoIn.numSamples; if (!(surf->flags & RADEON_SURF_Z_OR_SBUFFER)) - AddrSurfInfoIn.numFrags = MAX2(1, config->info.color_samples); + AddrSurfInfoIn.numFrags = MAX2(1, config->info.storage_samples); /* GFX9 doesn't support 1D depth textures, so allocate all 1D textures * as 2D to avoid having shader variants for 1D vs 2D, so all shaders diff --git a/src/amd/common/ac_surface.h b/src/amd/common/ac_surface.h index 6d95e610a59..8ba964e64ec 100644 --- a/src/amd/common/ac_surface.h +++ b/src/amd/common/ac_surface.h @@ -226,7 +226,7 @@ struct ac_surf_info { uint32_t height; uint32_t depth; uint8_t samples; /* For Z/S: samples; For color: FMASK coverage samples */ - uint8_t color_samples; /* For color: color samples */ + uint8_t storage_samples; /* For color: allocated samples */ uint8_t levels; uint8_t num_channels; /* heuristic for displayability */ uint16_t array_size; diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c index 826f898d281..f1c78e8115d 100644 --- a/src/amd/vulkan/radv_image.c +++ b/src/amd/vulkan/radv_image.c @@ -937,7 +937,7 @@ radv_image_create(VkDevice _device, image->info.height = pCreateInfo->extent.height; image->info.depth = pCreateInfo->extent.depth; image->info.samples = pCreateInfo->samples; - image->info.color_samples = pCreateInfo->samples; + image->info.storage_samples = pCreateInfo->samples; image->info.array_size = pCreateInfo->arrayLayers; image->info.levels = pCreateInfo->mipLevels; image->info.num_channels = vk_format_get_nr_components(pCreateInfo->format); |