summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/r600
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2018-05-23 22:42:49 -0400
committerMarek Olšák <marek.olsak@amd.com>2018-07-31 18:28:41 -0400
commit20dd75a9268a1adf0a8b47267ba2c5acc55cb207 (patch)
tree20aa9d150a6b6c3bd64405e88ef5ec115036f627 /src/gallium/drivers/r600
parent966f155623e5a626f1d788af7e0f602cdcee6993 (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 <Dieter@nuetzel-hh.de>
Diffstat (limited to 'src/gallium/drivers/r600')
-rw-r--r--src/gallium/drivers/r600/r600_texture.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index 9e2d5c7fc9e..08db6bab04c 100644
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -245,7 +245,7 @@ static int r600_init_surface(struct r600_common_screen *rscreen,
if (!(ptex->flags & R600_RESOURCE_FLAG_FORCE_TILING))
flags |= RADEON_SURF_OPTIMIZE_FOR_SPACE;
- r = rscreen->ws->surface_init(rscreen->ws, ptex, ptex->nr_samples,
+ r = rscreen->ws->surface_init(rscreen->ws, ptex,
flags, bpe, array_mode, surface);
if (r) {
return r;
@@ -616,7 +616,7 @@ void r600_texture_get_fmask_info(struct r600_common_screen *rscreen,
bpe *= 2;
}
- if (rscreen->ws->surface_init(rscreen->ws, &templ, templ.nr_samples,
+ if (rscreen->ws->surface_init(rscreen->ws, &templ,
flags, bpe, RADEON_SURF_MODE_2D, &fmask)) {
R600_ERR("Got error in surface_init while allocating FMASK.\n");
return;