diff options
| author | degasus <wickmarkus@web.de> | 2017-11-25 11:07:14 +0100 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2017-12-02 15:17:39 +0100 |
| commit | e8febd0cef02c205b77ab6fdb7af33da59ce59cc (patch) | |
| tree | a8b8882e4c4c2a880b32aaf3336272e1f0c079f4 /Source/Core/VideoBackends/Vulkan | |
| parent | 491c10ec96e4cb58724f0768a76e0cece63f2b07 (diff) | |
VideoCommon: Create a namespace for TextureConversionShaderGen.
Diffstat (limited to 'Source/Core/VideoBackends/Vulkan')
| -rw-r--r-- | Source/Core/VideoBackends/Vulkan/TextureCache.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Vulkan/TextureCache.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/Vulkan/TextureCache.cpp b/Source/Core/VideoBackends/Vulkan/TextureCache.cpp index 130a494bb2..a97a560d55 100644 --- a/Source/Core/VideoBackends/Vulkan/TextureCache.cpp +++ b/Source/Core/VideoBackends/Vulkan/TextureCache.cpp @@ -307,7 +307,8 @@ void TextureCache::CopyEFBToCacheEntry(TCacheEntry* entry, bool is_depth_copy, texture->GetRawTexIdentifier()->TransitionToLayout(command_buffer, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); - auto uid = GetTextureConverterShaderUid(dst_format, is_depth_copy, is_intensity, scale_by_half); + auto uid = TextureConversionShaderGen::GetShaderUid(dst_format, is_depth_copy, is_intensity, + scale_by_half); auto it = m_efb_copy_to_tex_shaders.emplace(uid, VkShaderModule(VK_NULL_HANDLE)); VkShaderModule& shader = it.first->second; @@ -316,7 +317,8 @@ void TextureCache::CopyEFBToCacheEntry(TCacheEntry* entry, bool is_depth_copy, if (created) { std::string source = g_shader_cache->GetUtilityShaderHeader(); - source += GenerateTextureConverterShaderCode(APIType::Vulkan, uid.GetUidData()).GetBuffer(); + source += + TextureConversionShaderGen::GenerateShader(APIType::Vulkan, uid.GetUidData()).GetBuffer(); shader = Util::CompileAndCreateFragmentShader(source); } diff --git a/Source/Core/VideoBackends/Vulkan/TextureCache.h b/Source/Core/VideoBackends/Vulkan/TextureCache.h index 0e29229d18..26a01be3bb 100644 --- a/Source/Core/VideoBackends/Vulkan/TextureCache.h +++ b/Source/Core/VideoBackends/Vulkan/TextureCache.h @@ -65,7 +65,7 @@ private: std::unique_ptr<TextureConverter> m_texture_converter; VkShaderModule m_copy_shader = VK_NULL_HANDLE; - std::map<TextureConverterShaderUid, VkShaderModule> m_efb_copy_to_tex_shaders; + std::map<TextureConversionShaderGen::TCShaderUid, VkShaderModule> m_efb_copy_to_tex_shaders; }; } // namespace Vulkan |