Merge pull request #2960 from phire/improve_efb2tex

Make efb2tex behave much more like efb2ram.
This commit is contained in:
Scott Mansell
2015-09-07 14:12:03 +12:00
6 changed files with 71 additions and 25 deletions

View File

@ -237,10 +237,10 @@ void TextureCache::TCacheEntry::FromRenderTarget(u8* dst, unsigned int dstFormat
g_renderer->RestoreAPIState();
if (!g_ActiveConfig.bSkipEFBCopyToRam)
{
if (g_ActiveConfig.bSkipEFBCopyToRam)
this->Zero(dst);
else
g_encoder->Encode(dst, this, srcFormat, srcRect, isIntensity, scaleByHalf);
}
}
const char palette_shader[] =

View File

@ -262,7 +262,11 @@ void TextureCache::TCacheEntry::FromRenderTarget(u8* dstPointer, unsigned int ds
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
if (!g_ActiveConfig.bSkipEFBCopyToRam)
if (g_ActiveConfig.bSkipEFBCopyToRam)
{
this->Zero(dstPointer);
}
else
{
TextureConverter::EncodeToRamFromTexture(
dstPointer,