From e7ed89f1bcf9e99eb6d380915c9c98817948bb43 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Fri, 12 Aug 2022 08:52:45 -0700 Subject: [PATCH] microsoft/compiler: Discard shouldn't be marked readnone Cc: mesa-stable Reviewed-by: Boris Brezillon Part-of: (cherry picked from commit 34294bd9bbfe9b1694f522e773be6f640beb86ca) --- .pick_status.json | 2 +- src/microsoft/compiler/dxil_function.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 9e20f9939b2..c79c27586a1 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -382,7 +382,7 @@ "description": "microsoft/compiler: Discard shouldn't be marked readnone", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/microsoft/compiler/dxil_function.c b/src/microsoft/compiler/dxil_function.c index cc78f822847..e7b3ab36cff 100644 --- a/src/microsoft/compiler/dxil_function.c +++ b/src/microsoft/compiler/dxil_function.c @@ -62,7 +62,7 @@ static struct predefined_func_descr predefined_funcs[] = { {"dx.op.textureLoad", "R", "i@iiiiiii", DXIL_ATTR_KIND_READ_ONLY}, {"dx.op.textureGather", "R", "i@@ffffiii", DXIL_ATTR_KIND_READ_ONLY}, {"dx.op.textureGatherCmp", "R", "i@@ffffiiif", DXIL_ATTR_KIND_READ_ONLY}, -{"dx.op.discard", "v", "ib", DXIL_ATTR_KIND_READ_NONE}, +{"dx.op.discard", "v", "ib", DXIL_ATTR_KIND_NO_UNWIND}, {"dx.op.sampleIndex", "i", "i", DXIL_ATTR_KIND_READ_NONE}, {"dx.op.emitStream", "v", "ic", DXIL_ATTR_KIND_NONE}, {"dx.op.cutStream", "v", "ic", DXIL_ATTR_KIND_NONE},