[Mesa-dev] [PATCH 1/2] radv: allow to dump the GS copy shader with RADV_DEBUG="shaders"

[Samuel Pitoiset]

Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
---
 src/amd/vulkan/radv_pipeline.c | 2 +-
 src/amd/vulkan/radv_shader.c   | 2 +-
 src/amd/vulkan/radv_shader.h   | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index b4e4f3211e2..4a2b16fdf68 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -1976,7 +1976,7 @@ void radv_create_shaders(struct radv_pipeline *pipeline,
        radv_link_shaders(pipeline, nir);
 
        for (int i = 0; i < MESA_SHADER_STAGES; ++i) {
-               if (modules[i] && radv_can_dump_shader(device, modules[i]))
+               if (modules[i] && radv_can_dump_shader(device, modules[i], 
false))
                        nir_print_shader(nir[i], stderr);
        }
 
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index cdd4142f291..24ece0974a7 100644
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -488,7 +488,7 @@ shader_variant_create(struct radv_device *device,
 
        options->family = chip_family;
        options->chip_class = device->physical_device->rad_info.chip_class;
-       options->dump_shader = radv_can_dump_shader(device, module);
+       options->dump_shader = radv_can_dump_shader(device, module, 
gs_copy_shader);
        options->dump_preoptir = options->dump_shader &&
                                 device->instance->debug_flags & 
RADV_DEBUG_PREOPTIR;
        options->record_llvm_ir = device->keep_shader_info;
diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h
index c7e261c5ca7..7c9aed64378 100644
--- a/src/amd/vulkan/radv_shader.h
+++ b/src/amd/vulkan/radv_shader.h
@@ -350,11 +350,14 @@ radv_shader_dump_stats(struct radv_device *device,
 
 static inline bool
 radv_can_dump_shader(struct radv_device *device,
-                    struct radv_shader_module *module)
+                    struct radv_shader_module *module,
+                    bool is_gs_copy_shader)
 {
+       if (!(device->instance->debug_flags & RADV_DEBUG_DUMP_SHADERS))
+               return false;
+
        /* Only dump non-meta shaders, useful for debugging purposes. */
-       return device->instance->debug_flags & RADV_DEBUG_DUMP_SHADERS &&
-              module && !module->nir;
+       return (module && !module->nir) || is_gs_copy_shader;
 }
 
 static inline bool
-- 
2.17.0

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev