diff options
| author | Marek Olšák <[email protected]> | 2018-05-23 22:42:49 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2018-07-31 18:28:41 -0400 |
| commit | 20dd75a9268a1adf0a8b47267ba2c5acc55cb207 (patch) | |
| tree | 20aa9d150a6b6c3bd64405e88ef5ec115036f627 /src/amd/common/ac_surface.c | |
| parent | 966f155623e5a626f1d788af7e0f602cdcee6993 (diff) | |
radeonsi: use storage_samples instead of color_samples in most places
and use pipe_resource::nr_storage_samples instead of
r600_texture::num_color_samples.
Tested-by: Dieter Nützel <[email protected]>
Diffstat (limited to 'src/amd/common/ac_surface.c')
| -rw-r--r-- | src/amd/common/ac_surface.c | 6 |
1 files changed, 3 insertions, 3 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 |