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

VideoCommon/TextureConversionShader: Convert over to using ShaderCode
This commit is contained in:
Connor McLaughlin 2020-01-24 11:53:51 +10:00 committed by GitHub
commit 42c03c4dad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 510 additions and 510 deletions

View File

@ -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)

File diff suppressed because it is too large Load Diff

View File

@ -20,7 +20,7 @@ namespace TextureConversionShaderTiled
{
u16 GetEncodedSampleCount(EFBCopyFormat format);
const char* GenerateEncodingShader(const EFBCopyParams& params, APIType ApiType);
std::string GenerateEncodingShader(const EFBCopyParams& params, APIType api_type);
// Information required to compile and dispatch a texture decoding shader.
struct DecodingShaderInfo