From f3f8ce0fd426844063d34a0f58f2f59ad2c94b0e Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Tue, 25 Jun 2024 12:26:11 +0200 Subject: [PATCH] spirv: generate info for FunctionParameterAttribute Cc: mesa-stable Reviewed-by: Jesse Natalie Part-of: (cherry picked from commit 90db6c729d81b10841cfbd7bb6a49d011ae49d38) [Eric: manually added the function prototype to spirv_info.h since that was not auto-generated yet in 24.1] --- .pick_status.json | 2 +- src/compiler/spirv/spirv_info.h | 1 + src/compiler/spirv/spirv_info_c.py | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 80ac48cca81..4ca356f20d5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3514,7 +3514,7 @@ "description": "spirv: generate info for FunctionParameterAttribute", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/compiler/spirv/spirv_info.h b/src/compiler/spirv/spirv_info.h index c9bfcda18d0..fd7308d8fc3 100644 --- a/src/compiler/spirv/spirv_info.h +++ b/src/compiler/spirv/spirv_info.h @@ -39,5 +39,6 @@ const char *spirv_memorymodel_to_string(SpvMemoryModel cap); const char *spirv_op_to_string(SpvOp op); const char *spirv_storageclass_to_string(SpvStorageClass sc); const char *spirv_fproundingmode_to_string(SpvFPRoundingMode sc); +const char *spirv_functionparameterattribute_to_string(SpvFunctionParameterAttribute v); #endif /* SPIRV_INFO_H */ diff --git a/src/compiler/spirv/spirv_info_c.py b/src/compiler/spirv/spirv_info_c.py index 826250d0133..a43ece4097c 100644 --- a/src/compiler/spirv/spirv_info_c.py +++ b/src/compiler/spirv/spirv_info_c.py @@ -120,11 +120,12 @@ if __name__ == "__main__": collect_data(spirv_info, "Dim"), collect_data(spirv_info, "ExecutionMode"), collect_data(spirv_info, "ExecutionModel"), + collect_data(spirv_info, "FPRoundingMode"), + collect_data(spirv_info, "FunctionParameterAttribute"), collect_data(spirv_info, "ImageFormat"), + collect_data(spirv_info, "ImageOperands"), collect_data(spirv_info, "MemoryModel"), collect_data(spirv_info, "StorageClass"), - collect_data(spirv_info, "ImageOperands"), - collect_data(spirv_info, "FPRoundingMode"), collect_opcodes(spirv_info), ]