From f342f7602a70e388e922b4ebfa5ce4e2472a93a6 Mon Sep 17 00:00:00 2001
From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Thu, 11 Aug 2022 16:33:04 +0300
Subject: [PATCH] anv: fix GetPipelineExecutableStatistics for ray tracing
 pipelines
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: e10455585115d5 ("anv: Compile ray-tracing shaders")
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18013>
(cherry picked from commit d0e8f21100a4ab6a384e0c75cbe041299832b02d)
---
 .pick_status.json               | 2 +-
 src/intel/vulkan/anv_pipeline.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index bb3833a32b0..1d523c50576 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -12028,7 +12028,7 @@
         "description": "anv: fix GetPipelineExecutableStatistics for ray tracing pipelines",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "e10455585115d502702a3f642dfd386d0c7a0c69"
     },
diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c
index 37505bb8a09..6710020798d 100644
--- a/src/intel/vulkan/anv_pipeline.c
+++ b/src/intel/vulkan/anv_pipeline.c
@@ -3056,6 +3056,14 @@ VkResult anv_GetPipelineExecutableStatisticsKHR(
       prog_data = anv_pipeline_to_compute(pipeline)->cs->prog_data;
       break;
    }
+   case ANV_PIPELINE_RAY_TRACING: {
+      struct anv_shader_bin **shader =
+         util_dynarray_element(&anv_pipeline_to_ray_tracing(pipeline)->shaders,
+                               struct anv_shader_bin *,
+                               pExecutableInfo->executableIndex);
+      prog_data = (*shader)->prog_data;
+      break;
+   }
    default:
       unreachable("invalid pipeline type");
    }