r-b
On Wed, Aug 21, 2019 at 8:34 AM Samuel Pitoiset <samuel.pitoi...@gmail.com> wrote: > > Scans aren't implemented on SI/CIK. > > Cc: 19.2 <mesa-sta...@lists.freedesktop.org> > Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> > --- > src/amd/vulkan/radv_device.c | 3 ++- > src/amd/vulkan/radv_shader.c | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c > index cc45ac95c08..4aafe6e78aa 100644 > --- a/src/amd/vulkan/radv_device.c > +++ b/src/amd/vulkan/radv_device.c > @@ -383,7 +383,8 @@ radv_physical_device_init(struct radv_physical_device > *device, > device->rad_info.family == > CHIP_RENOIR || > device->rad_info.chip_class >= > GFX10; > > - device->use_shader_ballot = device->instance->perftest_flags & > RADV_PERFTEST_SHADER_BALLOT; > + device->use_shader_ballot = device->rad_info.chip_class >= GFX8 && > + device->instance->perftest_flags & > RADV_PERFTEST_SHADER_BALLOT; > > /* Determine the number of threads per wave for all stages. */ > device->cs_wave_size = 64; > diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c > index 1e6a9a950d8..f2a8ac8abe3 100644 > --- a/src/amd/vulkan/radv_shader.c > +++ b/src/amd/vulkan/radv_shader.c > @@ -297,7 +297,7 @@ radv_shader_compile_to_nir(struct radv_device *device, > .lower_ubo_ssbo_access_to_offsets = true, > .caps = { > .amd_gcn_shader = true, > - .amd_shader_ballot = > device->instance->perftest_flags & RADV_PERFTEST_SHADER_BALLOT, > + .amd_shader_ballot = > device->physical_device->use_shader_ballot, > .amd_trinary_minmax = true, > .derivative_group = true, > .descriptor_array_dynamic_indexing = true, > -- > 2.22.1 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev