diff options
| author | Samuel Pitoiset <[email protected]> | 2020-01-13 09:49:49 +0100 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2020-01-29 17:40:51 +0100 |
| commit | a61eff8330234306077444e97e178542991f6e27 (patch) | |
| tree | 51922a20fcc4ac2588bf5b2a24b67942311be303 | |
| parent | e4752dafede30fbfc93208d9d4091873a8bd5d31 (diff) | |
radv/gfx10: re-enable NGG GS
Now that NGG GS queries are implemented, it should be safe enough
to enable NGG GS by default. It can be disabled with RADV_DEBUG=nongg
if necessary.
Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3380>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3380>
| -rw-r--r-- | src/amd/vulkan/radv_pipeline.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index 26e45e2a76e..b065ca4258c 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -2435,21 +2435,6 @@ radv_fill_shader_keys(struct radv_device *device, keys[MESA_SHADER_TESS_EVAL].vs_common_out.as_ngg = false; } - /* - * Disable NGG with geometry shaders. There are a bunch of - * issues still: - * * GS primitives in pipeline statistic queries do not get - * updates. See dEQP-VK.query_pool.statistics_query.geometry_shader_primitives - * - * Furthermore, XGL/AMDVLK also disables this as of 9b632ef. - */ - 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++) { |