← Back to branch summary

~mmach/netext73/mesa_2004

« back to all changes in this revision

Viewing changes to src/amd/common/ac_nir_lower_tess_io_to_mem.c

  • Committer: mmach
  • Date: 2021-07-04 19:28:58 UTC
  • Revision ID: netbit73@gmail.com-20210704192858-3dzjz3h2a015l3mq
2021-07-04 21:20:24

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/amd/common/ac_nir_lower_tess_io_to_mem.c
430
430
                                .align_mul = 16u, .align_offset = (nir_intrinsic_component(intrin) * 4u) % 16u);
431
431
}
432
432
 
 
433
static void
 
434
update_hs_scoped_barrier(nir_intrinsic_instr *intrin)
 
435
{
 
436
   /* Output loads and stores are lowered to shared memory access,
 
437
    * so we have to update the barriers to also reflect this.
 
438
    */
 
439
   unsigned mem_modes = nir_intrinsic_memory_modes(intrin);
 
440
   if (mem_modes & nir_var_shader_out)
 
441
      mem_modes |= nir_var_mem_shared;
 
442
   nir_intrinsic_set_memory_modes(intrin, mem_modes);
 
443
}
 
444
 
433
445
static nir_ssa_def *
434
446
lower_hs_output_access(nir_builder *b,
435
447
                       nir_instr *instr,
442
454
       intrin->intrinsic == nir_intrinsic_store_per_vertex_output) {
443
455
      lower_hs_output_store(b, intrin, st);
444
456
      return NIR_LOWER_INSTR_PROGRESS_REPLACE;
445
 
   } else {
 
457
   } else if (intrin->intrinsic == nir_intrinsic_load_output ||
 
458
              intrin->intrinsic == nir_intrinsic_load_per_vertex_output) {
446
459
      return lower_hs_output_load(b, intrin, st);
 
460
   } else if (intrin->intrinsic == nir_intrinsic_scoped_barrier) {
 
461
      update_hs_scoped_barrier(intrin);
 
462
      return NIR_LOWER_INSTR_PROGRESS;
 
463
   } else {
 
464
      unreachable("intrinsic not supported by lower_hs_output_access");
447
465
   }
448
466
}
449
467
 
571
589
}
572
590
 
573
591
static bool
574
 
filter_any_output_access(const nir_instr *instr,
 
592
filter_hs_output_access(const nir_instr *instr,
575
593
                         UNUSED const void *st)
576
594
{
577
595
   if (instr->type != nir_instr_type_intrinsic)
581
599
   return intrin->intrinsic == nir_intrinsic_store_output ||
582
600
          intrin->intrinsic == nir_intrinsic_store_per_vertex_output ||
583
601
          intrin->intrinsic == nir_intrinsic_load_output ||
584
 
          intrin->intrinsic == nir_intrinsic_load_per_vertex_output;
 
602
          intrin->intrinsic == nir_intrinsic_load_per_vertex_output ||
 
603
          intrin->intrinsic == nir_intrinsic_scoped_barrier;
585
604
}
586
605
 
587
606
static bool
658
677
   };
659
678
 
660
679
   nir_shader_lower_instructions(shader,
661
 
                                 filter_any_output_access,
 
680
                                 filter_hs_output_access,
662
681
                                 lower_hs_output_access,
663
682
                                 &state);
664
683