From 1ae2c1ae9c27bc690c4a8ad3b33a6e3d57d87e04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Mon, 17 Apr 2023 15:08:30 +0200 Subject: [PATCH] radv/rt: fix total stack size computation Fixes: 2649a1f272cea69b73364d06a3dad21415921056 ('radv/rt: introduce and set rt_pipeline->stack_size ') Part-of: (cherry picked from commit b288ec803ca6eab6f37e3d64335abd98632e0f75) --- .pick_status.json | 2 +- src/amd/vulkan/radv_pipeline_rt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index e52498dbc99..5bbc1d9da93 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -715,7 +715,7 @@ "description": "radv/rt: fix total stack size computation", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "2649a1f272cea69b73364d06a3dad21415921056" }, diff --git a/src/amd/vulkan/radv_pipeline_rt.c b/src/amd/vulkan/radv_pipeline_rt.c index fb061b6e1fd..d1e6ebebbc7 100644 --- a/src/amd/vulkan/radv_pipeline_rt.c +++ b/src/amd/vulkan/radv_pipeline_rt.c @@ -584,7 +584,7 @@ radv_rt_pipeline_create(VkDevice _device, VkPipelineCache _cache, goto shader_fail; } - rt_pipeline->stack_size = compute_rt_stack_size(pCreateInfo, rt_pipeline->groups); + rt_pipeline->stack_size = compute_rt_stack_size(&local_create_info, rt_pipeline->groups); rt_pipeline->base.base.shaders[MESA_SHADER_COMPUTE] = radv_create_rt_prolog(device); combine_config(&rt_pipeline->base.base.shaders[MESA_SHADER_COMPUTE]->config,