Mesa (main): radv: Remove duplicate code for getting GS info.

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Jun 7 22:23:11 UTC 2021


Module: Mesa
Branch: main
Commit: 93b1089d195135cdc926c772af231e472179312a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=93b1089d195135cdc926c772af231e472179312a

Author: Timur Kristóf <timur.kristof at gmail.com>
Date:   Mon May 31 17:42:46 2021 +0200

radv: Remove duplicate code for getting GS info.

This was my mistake for forgetting to delete this code.

Signed-off-by: Timur Kristóf <timur.kristof at gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11092>

---

 src/amd/vulkan/radv_pipeline.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index b67430d281b..141183c860e 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -3510,24 +3510,6 @@ radv_create_shaders(struct radv_pipeline *pipeline, struct radv_device *device,
          nir_print_shader(nir[i], stderr);
    }
 
-   if ((nir[MESA_SHADER_VERTEX] && keys[MESA_SHADER_VERTEX].vs_common_out.as_ngg) ||
-       (nir[MESA_SHADER_TESS_EVAL] && keys[MESA_SHADER_TESS_EVAL].vs_common_out.as_ngg)) {
-      struct gfx10_ngg_info *ngg_info;
-
-      if (nir[MESA_SHADER_GEOMETRY])
-         ngg_info = &infos[MESA_SHADER_GEOMETRY].ngg_info;
-      else if (nir[MESA_SHADER_TESS_CTRL])
-         ngg_info = &infos[MESA_SHADER_TESS_EVAL].ngg_info;
-      else
-         ngg_info = &infos[MESA_SHADER_VERTEX].ngg_info;
-
-      gfx10_get_ngg_info(pipeline_key, pipeline, nir, infos, ngg_info);
-   } else if (nir[MESA_SHADER_GEOMETRY]) {
-      struct gfx9_gs_info *gs_info = &infos[MESA_SHADER_GEOMETRY].gs_ring_info;
-
-      gfx9_get_gs_info(pipeline_key, pipeline, nir, infos, gs_info);
-   }
-
    if (modules[MESA_SHADER_GEOMETRY]) {
       struct radv_shader_binary *gs_copy_binary = NULL;
       if (!radv_pipeline_has_ngg(pipeline)) {



More information about the mesa-commit mailing list