Module: Mesa Branch: staging/23.1 Commit: f85e2d9d007c05d66a88b1a55dad6b12a07feb96 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f85e2d9d007c05d66a88b1a55dad6b12a07feb96
Author: Marek Olšák <[email protected]> Date: Fri Sep 1 22:45:05 2023 -0400 ac/llvm: fix flat PS input corruption Fixes: 0a54fbb5b40fc4e4a - radeonsi/gfx11: interp changes for 32bit Reviewed-by: Timur Kristóf <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25492> (cherry picked from commit c7e08acd1283678a8f8ea3881b08ad97ea773d7e) --- .pick_status.json | 2 +- src/amd/llvm/ac_llvm_build.c | 1 + src/gallium/drivers/radeonsi/ci/gfx11-gfx1100-fail.csv | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 0d589bfc849..c208bfbf5ae 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1057,7 +1057,7 @@ "description": "ac/llvm: fix flat PS input corruption", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "0a54fbb5b40fc4e4abd60f9ff7dd71dfe5c1d6cc" }, diff --git a/src/amd/llvm/ac_llvm_build.c b/src/amd/llvm/ac_llvm_build.c index 0570ca7e36f..15ce63ec2e1 100644 --- a/src/amd/llvm/ac_llvm_build.c +++ b/src/amd/llvm/ac_llvm_build.c @@ -1086,6 +1086,7 @@ LLVMValueRef ac_build_fs_interp_mov(struct ac_llvm_context *ctx, unsigned parame p = ac_build_intrinsic(ctx, "llvm.amdgcn.lds.param.load", ctx->f32, args, 3, 0); + p = ac_build_intrinsic(ctx, "llvm.amdgcn.wqm.f32", ctx->f32, &p, 1, 0); p = ac_build_quad_swizzle(ctx, p, parameter, parameter, parameter, parameter); return ac_build_intrinsic(ctx, "llvm.amdgcn.wqm.f32", ctx->f32, &p, 1, 0); } else { diff --git a/src/gallium/drivers/radeonsi/ci/gfx11-gfx1100-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx11-gfx1100-fail.csv index 01ed89231cc..0a13e954217 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx11-gfx1100-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx11-gfx1100-fail.csv @@ -211,8 +211,6 @@ dEQP-GLES3.functional.texture.specification.texsubimage3d_pbo.rgb5_a1_2d_array,F dEQP-GLES3.functional.texture.specification.texsubimage3d_pbo.rgb5_a1_3d,Fail dEQP-GLES3.functional.texture.specification.texsubimage3d_pbo.rgba4_2d_array,Fail dEQP-GLES3.functional.texture.specification.texsubimage3d_pbo.rgba4_3d,Fail -dEQP-GLES31.functional.separate_shader.random.113,Fail -dEQP-GLES31.functional.separate_shader.random.82,Fail dEQP-GLES31.functional.separate_shader.random.17,Fail dEQP-GLES31.functional.separate_shader.random.45,Fail dEQP-GLES31.functional.texture.specification.teximage3d_pbo.rgb565_cube_array,Fail
