Merge pull request #8576 from lioncash/texture-cvt-shader-fmt

VideoCommon/TextureConversionShader: Convert over to using ShaderCode
dolphin-emu · Jan 24, 2020 · 42c03c4 · 42c03c4
2 parents a0b7c1b + 687f1f0
commit 42c03c4
Show file tree

Hide file tree

Showing 3 changed files with 483 additions and 483 deletions.
diff --git a/Source/Core/VideoCommon/ShaderCache.cpp b/Source/Core/VideoCommon/ShaderCache.cpp
@@ -1178,7 +1178,7 @@ const AbstractPipeline* ShaderCache::GetEFBCopyToRAMPipeline(const EFBCopyParams
   if (iter != m_efb_copy_to_ram_pipelines.end())
     return iter->second.get();
 
-  const char* const shader_code =
+  const std::string shader_code =
       TextureConversionShaderTiled::GenerateEncodingShader(uid, m_api_type);
   const auto shader = g_renderer->CreateShaderFromSource(ShaderStage::Pixel, shader_code);
   if (!shader)