ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent a0b7c1beae 687f1f0330
commit 42c03c4dad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 510 additions and 510 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/VideoCommon/ShaderCache.cpp
View File

@ -1178,7 +1178,7 @@ const AbstractPipeline* ShaderCache::GetEFBCopyToRAMPipeline(const EFBCopyParams
if (iter != m_efb_copy_to_ram_pipelines.end()) if (iter != m_efb_copy_to_ram_pipelines.end())
return iter->second.get(); return iter->second.get();
const char* const shader_code = const std::string shader_code =
TextureConversionShaderTiled::GenerateEncodingShader(uid, m_api_type); TextureConversionShaderTiled::GenerateEncodingShader(uid, m_api_type);
const auto shader = g_renderer->CreateShaderFromSource(ShaderStage::Pixel, shader_code); const auto shader = g_renderer->CreateShaderFromSource(ShaderStage::Pixel, shader_code);
if (!shader) if (!shader)

960
Source/Core/VideoCommon/TextureConversionShader.cpp
View File

File diff suppressed because it is too large Load Diff

2
Source/Core/VideoCommon/TextureConversionShader.h
View File

@ -20,7 +20,7 @@ namespace TextureConversionShaderTiled
{ {
u16 GetEncodedSampleCount(EFBCopyFormat format); 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. // Information required to compile and dispatch a texture decoding shader.
struct DecodingShaderInfo struct DecodingShaderInfo