Revert "radv/aco: disable NGG GS support because it randomly hangs the GPU"
This reverts commit b84d1a0c42
.
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7213>
This commit is contained in:
parent
d8435c1628
commit
6d32fcaaaf
|
@ -402,8 +402,6 @@ radv_physical_device_try_create(struct radv_instance *instance,
|
|||
device->rad_info.has_dedicated_vram &&
|
||||
!(device->instance->debug_flags & RADV_DEBUG_NO_NGG);
|
||||
|
||||
/* FIXME: ACO NGG GS randomly hangs the GPU with CTS. */
|
||||
device->use_ngg_gs = device->use_ngg && device->use_llvm;
|
||||
device->use_ngg_streamout = false;
|
||||
|
||||
/* Determine the number of threads per wave for all stages. */
|
||||
|
|
|
@ -2619,15 +2619,6 @@ radv_fill_shader_keys(struct radv_device *device,
|
|||
keys[MESA_SHADER_TESS_EVAL].vs_common_out.as_ngg = false;
|
||||
}
|
||||
|
||||
if (!device->physical_device->use_ngg_gs) {
|
||||
if (nir[MESA_SHADER_GEOMETRY]) {
|
||||
if (nir[MESA_SHADER_TESS_CTRL])
|
||||
keys[MESA_SHADER_TESS_EVAL].vs_common_out.as_ngg = false;
|
||||
else
|
||||
keys[MESA_SHADER_VERTEX].vs_common_out.as_ngg = false;
|
||||
}
|
||||
}
|
||||
|
||||
gl_shader_stage last_xfb_stage = MESA_SHADER_VERTEX;
|
||||
|
||||
for (int i = MESA_SHADER_VERTEX; i <= MESA_SHADER_GEOMETRY; i++) {
|
||||
|
|
|
@ -300,9 +300,6 @@ struct radv_physical_device {
|
|||
/* Whether to enable NGG. */
|
||||
bool use_ngg;
|
||||
|
||||
/* Whether to enable NGG GS. */
|
||||
bool use_ngg_gs;
|
||||
|
||||
/* Whether to enable NGG streamout. */
|
||||
bool use_ngg_streamout;
|
||||
|
||||
|
|
|
@ -1134,7 +1134,7 @@ radv_query_pool_needs_gds(struct radv_device *device,
|
|||
* TODO: fix use of NGG GS and non-NGG GS inside the same begin/end
|
||||
* query.
|
||||
*/
|
||||
return device->physical_device->use_ngg_gs &&
|
||||
return device->physical_device->use_ngg &&
|
||||
(pool->pipeline_stats_mask & VK_QUERY_PIPELINE_STATISTIC_GEOMETRY_SHADER_PRIMITIVES_BIT);
|
||||
}
|
||||
|
||||
|
|
|
@ -557,7 +557,7 @@ radv_shader_compile_to_nir(struct radv_device *device,
|
|||
if (nir->info.stage == MESA_SHADER_GEOMETRY) {
|
||||
unsigned nir_gs_flags = nir_lower_gs_intrinsics_per_stream;
|
||||
|
||||
if (device->physical_device->use_ngg_gs && !radv_use_llvm_for_stage(device, stage)) {
|
||||
if (device->physical_device->use_ngg && !radv_use_llvm_for_stage(device, stage)) {
|
||||
/* ACO needs NIR to do some of the hard lifting */
|
||||
nir_gs_flags |= nir_lower_gs_intrinsics_count_primitives |
|
||||
nir_lower_gs_intrinsics_count_vertices_per_primitive |
|
||||
|
|
Loading…
Reference in New Issue