[Mesa-dev] [PATCH 03/10] radeonsi: set some image descriptor fields at bind time

[Marek Olšák]

On Wed, Jun 1, 2016 at 1:18 AM, Bas Nieuwenhuizen
<bas at basnieuwenhuizen.nl> wrote:
> On Thu, May 19, 2016 at 12:59 PM, Marek Olšák <maraeo at gmail.com> wrote:
>> From: Marek Olšák <marek.olsak at amd.com>
>>
>> mainly the fields that can change by reallocating a texture and changing
>> the tile mode
>> ---
>>  src/gallium/drivers/radeonsi/si_descriptors.c | 64 +++++++++++++----
>>  src/gallium/drivers/radeonsi/si_pipe.h        |  3 +
>>  src/gallium/drivers/radeonsi/si_state.c       | 99 ++++++++++++---------------
>>  src/gallium/drivers/radeonsi/si_state.h       | 16 ++++-
>>  4 files changed, 111 insertions(+), 71 deletions(-)
>>
>> diff --git a/src/gallium/drivers/radeonsi/si_descriptors.c b/src/gallium/drivers/radeonsi/si_descriptors.c
>> index 855b79e..48b1e14 100644
>> --- a/src/gallium/drivers/radeonsi/si_descriptors.c
>> +++ b/src/gallium/drivers/radeonsi/si_descriptors.c
>> @@ -60,6 +60,7 @@
>>  #include "si_shader.h"
>>  #include "sid.h"
>>
>> +#include "util/u_format.h"
>>  #include "util/u_math.h"
>>  #include "util/u_memory.h"
>>  #include "util/u_suballoc.h"
>> @@ -294,40 +295,70 @@ static void si_sampler_views_begin_new_cs(struct si_context *sctx,
>>                               RADEON_USAGE_READWRITE, RADEON_PRIO_DESCRIPTORS);
>>  }
>>
>> +void si_set_mutable_tex_desc_fields(struct r600_texture *tex,
>> +                                   const struct radeon_surf_level *base_level_info,
>> +                                   unsigned base_level, unsigned block_width,
>> +                                   bool is_stencil, uint32_t *state)
>> +{
>> +       uint64_t va = tex->resource.gpu_address + base_level_info->offset;
>> +       unsigned pitch = base_level_info->nblk_x * block_width;
>> +
>> +       state[1] &= C_008F14_BASE_ADDRESS_HI;
>> +       state[3] &= C_008F1C_TILING_INDEX;
>> +       state[4] &= C_008F20_PITCH;
>> +       state[6] &= C_008F28_COMPRESSION_EN;
>
> Aren't these fields cleared already? Either way, the series is

Yes, they are cleared, but it doesn't hurt. ;)

>
> Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
>
> with the v2 of patch 10.

Thanks.

Marek