From 49b0a140a731069e0e4959c65bfd1b597a4fb141 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 24 Jan 2018 23:26:20 +0100 Subject: [PATCH] ac/nir: set amdgpu.uniform and invariant.load for UBOs UBOs are constants buffers. Cc: "18.0" Fixes: 41c36c45 ("amd/common: use ac_build_buffer_load() for emitting UBO loads") Signed-off-by: Samuel Pitoiset Tested-by: Alex Smith Reviewed-by: Bas Nieuwenhuizen --- src/amd/common/ac_nir_to_llvm.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/amd/common/ac_nir_to_llvm.c b/src/amd/common/ac_nir_to_llvm.c index 6833439cc12..7425f0af20c 100644 --- a/src/amd/common/ac_nir_to_llvm.c +++ b/src/amd/common/ac_nir_to_llvm.c @@ -4568,8 +4568,14 @@ static LLVMValueRef radv_load_ssbo(struct ac_shader_abi *abi, static LLVMValueRef radv_load_ubo(struct ac_shader_abi *abi, LLVMValueRef buffer_ptr) { struct nir_to_llvm_context *ctx = nir_to_llvm_context_from_abi(abi); + LLVMValueRef result; - return LLVMBuildLoad(ctx->builder, buffer_ptr, ""); + LLVMSetMetadata(buffer_ptr, ctx->ac.uniform_md_kind, ctx->ac.empty_md); + + result = LLVMBuildLoad(ctx->builder, buffer_ptr, ""); + LLVMSetMetadata(result, ctx->ac.invariant_load_md_kind, ctx->ac.empty_md); + + return result; } static LLVMValueRef radv_get_sampler_desc(struct ac_shader_abi *abi, -- 2.30.2