radeonsi: only initialize dirty_mask when CE is used
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>
Wed, 28 Jun 2017 16:48:14 +0000 (18:48 +0200)
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>
Tue, 22 Aug 2017 09:34:23 +0000 (11:34 +0200)
Looks like it's useless to initialize that field when CE is
unused. This will also allow to declare more than 64 elements
for the array of bindless descriptors.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
src/gallium/drivers/radeonsi/si_descriptors.c

index 1f6e704b4bccec28b64793fc6f60e274485ce09e..c26b8291cfb11464c23fa3704550607bb354f93e 100644 (file)
@@ -125,19 +125,20 @@ static void si_init_descriptors(struct si_context *sctx,
                                unsigned num_ce_slots,
                                unsigned *ce_offset)
 {
-       assert(num_elements <= sizeof(desc->dirty_mask)*8);
-
        desc->list = CALLOC(num_elements, element_dw_size * 4);
        desc->element_dw_size = element_dw_size;
        desc->num_elements = num_elements;
        desc->first_ce_slot = sctx->ce_ib ? first_ce_slot : 0;
        desc->num_ce_slots = sctx->ce_ib ? num_ce_slots : 0;
-       desc->dirty_mask = u_bit_consecutive64(0, num_elements);
+       desc->dirty_mask = 0;
        desc->shader_userdata_offset = shader_userdata_index * 4;
 
        if (desc->num_ce_slots) {
+               assert(num_elements <= sizeof(desc->dirty_mask)*8);
+
                desc->uses_ce = true;
                desc->ce_offset = *ce_offset;
+               desc->dirty_mask = u_bit_consecutive64(0, num_elements);
 
                *ce_offset += element_dw_size * desc->num_ce_slots * 4;
        }