diff options
| author | Marek Olšák <[email protected]> | 2018-04-30 22:48:00 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2018-05-10 18:26:33 -0400 |
| commit | 835095973df84e3970582c6a3d4a9729990ddda2 (patch) | |
| tree | f2ffbb417c06bcd932da5fd04cf75953ea6c246e /src/gallium/drivers/radeonsi/si_descriptors.c | |
| parent | bdc3e410f75d6fd2a3e979447fd5ab69512fd724 (diff) | |
radeonsi: remove r600_fmask_info
radeon_surf contains almost everything.
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_descriptors.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_descriptors.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c index 9f2433a5b72..1d14c9df1e1 100644 --- a/src/gallium/drivers/radeonsi/si_descriptors.c +++ b/src/gallium/drivers/radeonsi/si_descriptors.c @@ -467,7 +467,7 @@ static void si_set_sampler_view_desc(struct si_context *sctx, desc); } - if (!is_buffer && rtex->fmask.size) { + if (!is_buffer && rtex->surface.fmask_size) { memcpy(desc + 8, sview->fmask_state, 8*4); } else { /* Disable FMASK and bind sampler state in [12:15]. */ @@ -482,7 +482,7 @@ static void si_set_sampler_view_desc(struct si_context *sctx, static bool color_needs_decompression(struct r600_texture *rtex) { - return rtex->fmask.size || + return rtex->surface.fmask_size || (rtex->dirty_level_mask && (rtex->cmask.size || rtex->dcc_offset)); } @@ -714,13 +714,13 @@ static void si_set_shader_image_desc(struct si_context *ctx, * so we don't wanna trigger it. */ if (tex->is_depth || - (!fmask_desc && tex->fmask.size != 0)) { + (!fmask_desc && tex->surface.fmask_size != 0)) { assert(!"Z/S and MSAA image stores are not supported"); access &= ~PIPE_IMAGE_ACCESS_WRITE; } assert(!tex->is_depth); - assert(fmask_desc || tex->fmask.size == 0); + assert(fmask_desc || tex->surface.fmask_size == 0); if (uses_dcc && !skip_decompress && (view->access & PIPE_IMAGE_ACCESS_WRITE || @@ -980,7 +980,7 @@ static void si_bind_sampler_states(struct pipe_context *ctx, sview->base.texture->target != PIPE_BUFFER) tex = (struct r600_texture *)sview->base.texture; - if (tex && tex->fmask.size) + if (tex && tex->surface.fmask_size) continue; si_set_sampler_state_desc(sstates[i], sview, tex, |