Fix incorrect default format for non-albedo

sultim-t · Sep 9, 2023 · 46261cd · 46261cd
1 parent a0bdf89
commit 46261cd
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/Source/TextureManager.cpp b/Source/TextureManager.cpp
@@ -446,22 +446,22 @@ bool TextureManager::TryCreateMaterial( VkCommandBuffer cmd,
 
  // clang-format off
  TextureOverrides ovrd[] = {
- TextureOverrides( ovrdFolder, info.pTextureName, postfixes[ 0 ], info.pPixels, info.size, getVkFormat( details, VK_FORMAT_R8G8B8A8_SRGB ), OnlyKTX2LoaderIfNonDevMode() ),
- TextureOverrides( ovrdFolder, info.pTextureName, postfixes[ 1 ], nullptr, {}, getVkFormat( details, VK_FORMAT_R8G8B8A8_UNORM ), OnlyKTX2LoaderIfNonDevMode() ),
- TextureOverrides( ovrdFolder, info.pTextureName, postfixes[ 2 ], nullptr, {}, getVkFormat( details, VK_FORMAT_R8G8B8A8_UNORM ), OnlyKTX2LoaderIfNonDevMode() ),
- TextureOverrides( ovrdFolder, info.pTextureName, postfixes[ 3 ], nullptr, {}, getVkFormat( details, VK_FORMAT_R8G8B8A8_SRGB ), OnlyKTX2LoaderIfNonDevMode() ),
+ TextureOverrides{ ovrdFolder, info.pTextureName, postfixes[ 0 ], info.pPixels, info.size, getVkFormat( details, VK_FORMAT_R8G8B8A8_SRGB ), OnlyKTX2LoaderIfNonDevMode() },
+ TextureOverrides{ ovrdFolder, info.pTextureName, postfixes[ 1 ], nullptr, {}, VK_FORMAT_R8G8B8A8_UNORM, OnlyKTX2LoaderIfNonDevMode() },
+ TextureOverrides{ ovrdFolder, info.pTextureName, postfixes[ 2 ], nullptr, {}, VK_FORMAT_R8G8B8A8_UNORM, OnlyKTX2LoaderIfNonDevMode() },
+ TextureOverrides{ ovrdFolder, info.pTextureName, postfixes[ 3 ], nullptr, {}, VK_FORMAT_R8G8B8A8_SRGB, OnlyKTX2LoaderIfNonDevMode() },
  };
  static_assert( std::size( ovrd ) == TEXTURES_PER_MATERIAL_COUNT );
  // clang-format on
 
 
  SamplerManager::Handle samplers[] = {
- SamplerManager::Handle( info.filter, info.addressModeU, info.addressModeV ),
- SamplerManager::Handle( info.filter, info.addressModeU, info.addressModeV ),
- SamplerManager::Handle( forceNormalMapFilterLinear ? RG_SAMPLER_FILTER_LINEAR : info.filter,
+ SamplerManager::Handle{ info.filter, info.addressModeU, info.addressModeV },
+ SamplerManager::Handle{ info.filter, info.addressModeU, info.addressModeV },
+ SamplerManager::Handle{ forceNormalMapFilterLinear ? RG_SAMPLER_FILTER_LINEAR : info.filter,
  info.addressModeU,
- info.addressModeV ),
- SamplerManager::Handle( info.filter, info.addressModeU, info.addressModeV ),
+ info.addressModeV },
+ SamplerManager::Handle{ info.filter, info.addressModeU, info.addressModeV },
  };
  static_assert( std::size( samplers ) == TEXTURES_PER_MATERIAL_COUNT );
  static_assert( TEXTURE_NORMAL_INDEX == 2 );