From 6fbfec0460947e45cb9824eeb9a85ed2e12948a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Briano?= Date: Tue, 2 Jul 2024 10:18:44 -0700 Subject: [PATCH] anv: get scratch surface from the correct pool MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: 3ccf80f9b15 ("anv: prepare 2 variants of all shader instructions") Reviewed-by: José Roberto de Souza Part-of: (cherry picked from commit ece7abb599e2fa59acd888985b93ea60360dbdbd) --- .pick_status.json | 2 +- src/intel/vulkan/genX_pipeline.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 5e951208d42..6d9705b762b 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -134,7 +134,7 @@ "description": "anv: get scratch surface from the correct pool", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "3ccf80f9b15a49bbd79702d3c4de7ee65c8837b1", "notes": null diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c index 24393174c87..8ca033f32df 100644 --- a/src/intel/vulkan/genX_pipeline.c +++ b/src/intel/vulkan/genX_pipeline.c @@ -1224,8 +1224,7 @@ get_scratch_surf(struct anv_pipeline *pipeline, anv_scratch_pool_alloc(pipeline->device, pool, stage, bin->prog_data->total_scratch); anv_reloc_list_add_bo(pipeline->batch.relocs, bo); - return anv_scratch_pool_get_surf(pipeline->device, - &pipeline->device->scratch_pool, + return anv_scratch_pool_get_surf(pipeline->device, pool, bin->prog_data->total_scratch) >> 4; }