From 9cdf2383e99fac2110d788da070f16b2b5c678e7 Mon Sep 17 00:00:00 2001 From: Feng Chen Date: Tue, 7 Sep 2021 12:34:35 +0800 Subject: Move attribute related definitions to spirv anonymous namespace --- src/shader_recompiler/frontend/ir/attribute.cpp | 18 ------------------ src/shader_recompiler/frontend/ir/attribute.h | 7 ------- 2 files changed, 25 deletions(-) (limited to 'src/shader_recompiler/frontend/ir') diff --git a/src/shader_recompiler/frontend/ir/attribute.cpp b/src/shader_recompiler/frontend/ir/attribute.cpp index 5b3694f65..4d0b8b8e5 100644 --- a/src/shader_recompiler/frontend/ir/attribute.cpp +++ b/src/shader_recompiler/frontend/ir/attribute.cpp @@ -9,24 +9,6 @@ namespace Shader::IR { -bool IsFixedFncTexture(Attribute attribute) { - return attribute >= Attribute::FixedFncTexture0S && attribute <= Attribute::FixedFncTexture9Q; -} - -u32 FixedFncTextureAttributeIndex(Attribute attribute) { - if (!IsFixedFncTexture(attribute)) { - throw InvalidArgument("Attribute is not fixedfnctexture {}", attribute); - } - return (static_cast(attribute) - static_cast(Attribute::FixedFncTexture0S)) / 4u; -} - -u32 FixedFncTextureAttributeElement(Attribute attribute) { - if (!IsFixedFncTexture(attribute)) { - throw InvalidArgument("Attribute is not fixedfnctexture {}", attribute); - } - return static_cast(attribute) % 4; -} - bool IsGeneric(Attribute attribute) noexcept { return attribute >= Attribute::Generic0X && attribute <= Attribute::Generic31X; } diff --git a/src/shader_recompiler/frontend/ir/attribute.h b/src/shader_recompiler/frontend/ir/attribute.h index 9ca4dd76e..ca1199494 100644 --- a/src/shader_recompiler/frontend/ir/attribute.h +++ b/src/shader_recompiler/frontend/ir/attribute.h @@ -222,15 +222,8 @@ enum class Attribute : u64 { FrontFace = 255, }; -constexpr size_t NUM_FIXEDFNCTEXTURE = 10; constexpr size_t NUM_GENERICS = 32; -[[nodiscard]] bool IsFixedFncTexture(Attribute attribute); - -[[nodiscard]] u32 FixedFncTextureAttributeIndex(Attribute attribute); - -[[nodiscard]] u32 FixedFncTextureAttributeElement(Attribute attribute); - [[nodiscard]] bool IsGeneric(Attribute attribute) noexcept; [[nodiscard]] u32 GenericAttributeIndex(Attribute attribute); -- cgit v1.2.3