From 5000c344cc894a1c4d357ad2a6d0159ad6f204b6 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 8 Oct 2020 16:49:44 +0200 Subject: [PATCH] ac/llvm: move AC_FETCH_FORMAT to non-LLVM code While we are it, give it a name. Signed-off-by: Samuel Pitoiset Reviewed-by: Pierre-Eric Pelloux-Prayer Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/common/ac_shader_util.h | 16 ++++++++++++++++ src/amd/llvm/ac_llvm_build.h | 15 --------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/amd/common/ac_shader_util.h b/src/amd/common/ac_shader_util.h index c2a5233..738cc32 100644 --- a/src/amd/common/ac_shader_util.h +++ b/src/amd/common/ac_shader_util.h @@ -61,6 +61,22 @@ struct ac_spi_color_formats { unsigned blend_alpha : 8; }; +/* For ac_build_fetch_format. + * + * Note: FLOAT must be 0 (used for convenience of encoding in radeonsi). + */ +enum ac_fetch_format +{ + AC_FETCH_FORMAT_FLOAT = 0, + AC_FETCH_FORMAT_FIXED, + AC_FETCH_FORMAT_UNORM, + AC_FETCH_FORMAT_SNORM, + AC_FETCH_FORMAT_USCALED, + AC_FETCH_FORMAT_SSCALED, + AC_FETCH_FORMAT_UINT, + AC_FETCH_FORMAT_SINT, +}; + unsigned ac_get_spi_shader_z_format(bool writes_z, bool writes_stencil, bool writes_samplemask); unsigned ac_get_cb_shader_mask(unsigned spi_shader_col_format); diff --git a/src/amd/llvm/ac_llvm_build.h b/src/amd/llvm/ac_llvm_build.h index 8423c87..d34f6c5 100644 --- a/src/amd/llvm/ac_llvm_build.h +++ b/src/amd/llvm/ac_llvm_build.h @@ -281,21 +281,6 @@ LLVMValueRef ac_build_raw_tbuffer_load(struct ac_llvm_context *ctx, LLVMValueRef LLVMValueRef immoffset, unsigned num_channels, unsigned dfmt, unsigned nfmt, unsigned cache_policy, bool can_speculate); -/* For ac_build_fetch_format. - * - * Note: FLOAT must be 0 (used for convenience of encoding in radeonsi). - */ -enum -{ - AC_FETCH_FORMAT_FLOAT = 0, - AC_FETCH_FORMAT_FIXED, - AC_FETCH_FORMAT_UNORM, - AC_FETCH_FORMAT_SNORM, - AC_FETCH_FORMAT_USCALED, - AC_FETCH_FORMAT_SSCALED, - AC_FETCH_FORMAT_UINT, - AC_FETCH_FORMAT_SINT, -}; LLVMValueRef ac_build_opencoded_load_format(struct ac_llvm_context *ctx, unsigned log_size, unsigned num_channels, unsigned format, bool reverse, -- 2.7.4