Use anisotropy enums instead hardcoded values

cdozdil · Feb 27, 2025 · eea2059 · eea2059
1 parent 14dc309
commit eea2059
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/OptiScaler/hooks/HooksDx.cpp b/OptiScaler/hooks/HooksDx.cpp
@@ -3671,25 +3671,25 @@ static void hkCreateSampler(ID3D12Device* device, const D3D12_SAMPLER_DESC* pDes
 
     if (Config::Instance()->AnisotropyOverride.has_value())
     {
-        if (pDesc->Filter <= 0x55)
+        if (pDesc->Filter <= D3D12_FILTER_ANISOTROPIC)
         {
             newDesc.Filter = D3D12_FILTER_ANISOTROPIC;
             LOG_DEBUG("Overriding {2:X} to anisotropic filtering {0} -> {1}", pDesc->MaxAnisotropy, Config::Instance()->AnisotropyOverride.value(), (UINT)pDesc->Filter);
             newDesc.MaxAnisotropy = Config::Instance()->AnisotropyOverride.value();
         }
-        else if (pDesc->Filter > 0x55 && pDesc->Filter <= 0xd5)
+        else if (pDesc->Filter > D3D12_FILTER_ANISOTROPIC && pDesc->Filter <= D3D12_FILTER_COMPARISON_ANISOTROPIC)
         {
             newDesc.Filter = D3D12_FILTER_COMPARISON_ANISOTROPIC;
             LOG_DEBUG("Overriding {2:X} to anisotropic filtering {0} -> {1}", pDesc->MaxAnisotropy, Config::Instance()->AnisotropyOverride.value(), (UINT)pDesc->Filter);
             newDesc.MaxAnisotropy = Config::Instance()->AnisotropyOverride.value();
         }
-        else if (pDesc->Filter > 0xd5 && pDesc->Filter <= 0x155)
+        else if (pDesc->Filter > D3D12_FILTER_COMPARISON_ANISOTROPIC && pDesc->Filter <= D3D12_FILTER_MINIMUM_ANISOTROPIC)
         {
             newDesc.Filter = D3D12_FILTER_MINIMUM_ANISOTROPIC;
             LOG_DEBUG("Overriding {2:X} to anisotropic filtering {0} -> {1}", pDesc->MaxAnisotropy, Config::Instance()->AnisotropyOverride.value(), (UINT)pDesc->Filter);
             newDesc.MaxAnisotropy = Config::Instance()->AnisotropyOverride.value();
         }
-        else if (pDesc->Filter > 0x155 && pDesc->Filter <= 0x1d5)
+        else if (pDesc->Filter > D3D12_FILTER_MINIMUM_ANISOTROPIC && pDesc->Filter <= D3D12_FILTER_MAXIMUM_ANISOTROPIC)
         {
             newDesc.Filter = D3D12_FILTER_MAXIMUM_ANISOTROPIC;
             LOG_DEBUG("Overriding {2:X} to anisotropic filtering {0} -> {1}", pDesc->MaxAnisotropy, Config::Instance()->AnisotropyOverride.value(), (UINT)pDesc->Filter);
@@ -3755,25 +3755,25 @@ static HRESULT hkCreateSamplerState(ID3D11Device* This, const D3D11_SAMPLER_DESC
 
     if (Config::Instance()->AnisotropyOverride.has_value())
     {
-        if (pSamplerDesc->Filter <= 0x55)
+        if (pSamplerDesc->Filter <= D3D11_FILTER_ANISOTROPIC)
         {
             newDesc.Filter = D3D11_FILTER_ANISOTROPIC;
             LOG_DEBUG("Overriding {2:X} to anisotropic filtering {0} -> {1}", pSamplerDesc->MaxAnisotropy, Config::Instance()->AnisotropyOverride.value(), (UINT)pSamplerDesc->Filter);
             newDesc.MaxAnisotropy = Config::Instance()->AnisotropyOverride.value();
         }
-        else if (pSamplerDesc->Filter > 0x55 && pSamplerDesc->Filter <= 0xd5)
+        else if (pSamplerDesc->Filter > D3D11_FILTER_ANISOTROPIC && pSamplerDesc->Filter <= D3D11_FILTER_COMPARISON_ANISOTROPIC)
         {
             newDesc.Filter = D3D11_FILTER_COMPARISON_ANISOTROPIC;
             LOG_DEBUG("Overriding {2:X} to anisotropic filtering {0} -> {1}", pSamplerDesc->MaxAnisotropy, Config::Instance()->AnisotropyOverride.value(), (UINT)pSamplerDesc->Filter);
             newDesc.MaxAnisotropy = Config::Instance()->AnisotropyOverride.value();
         }
-        else if (pSamplerDesc->Filter > 0xd5 && pSamplerDesc->Filter <= 0x155)
+        else if (pSamplerDesc->Filter > D3D11_FILTER_COMPARISON_ANISOTROPIC && pSamplerDesc->Filter <= D3D11_FILTER_MINIMUM_ANISOTROPIC)
         {
             newDesc.Filter = D3D11_FILTER_MINIMUM_ANISOTROPIC;
             LOG_DEBUG("Overriding {2:X} to anisotropic filtering {0} -> {1}", pSamplerDesc->MaxAnisotropy, Config::Instance()->AnisotropyOverride.value(), (UINT)pSamplerDesc->Filter);
             newDesc.MaxAnisotropy = Config::Instance()->AnisotropyOverride.value();
         }
-        else if (pSamplerDesc->Filter > 0x155 && pSamplerDesc->Filter <= 0x1d5)
+        else if (pSamplerDesc->Filter > D3D11_FILTER_MINIMUM_ANISOTROPIC && pSamplerDesc->Filter <= D3D11_FILTER_MAXIMUM_ANISOTROPIC)
         {
             newDesc.Filter = D3D11_FILTER_MAXIMUM_ANISOTROPIC;
             LOG_DEBUG("Overriding {2:X} to anisotropic filtering {0} -> {1}", pSamplerDesc->MaxAnisotropy, Config::Instance()->AnisotropyOverride.value(), (UINT)pSamplerDesc->Filter);