Decode EFB copies used as paletted textures. #2059

magumagu · 2015-02-15T21:43:14Z

A number of games make an EFB copy in I4/I8 format, then use it as a
texture in C4/C8 format. Detect when this happens, and decode the copy on
the GPU using the specified palette.

This has a few advantages: it allows using EFB2Tex for a few more games,
it, it preserves the resolution of scaled EFB copies, and it's probably a
bit faster.

D3D only at the moment, but porting to OpenGL should be straightforward. I'm not as familiar with the OpenGL API, though, so I would appreciate some help with that.

The changes to the texture cache (TextureCacheBase.h/cpp) are the part that really needs to be reviewed closely; I'm not really confident this is the right direction.

JMC47 · 2015-02-15T21:45:43Z

Pinging @degasus and @Sonicadvance1 for an OpenGL implementation.

delroth · 2015-02-15T22:11:21Z

https://fifoci.dolphin-emu.org/compare/105059-104832/

Very nice :)

Mullin · 2015-02-16T00:35:17Z

Very nice !

Source/Core/VideoCommon/TextureCacheBase.h

+			RAM_PALETTE,
+			// A texture with two TMEM addresses.
+			// May be either decoded with a palette or an RGBA8 texture with two parts.
+			DUAL_TMEM,


degasus · 2015-02-16T08:23:40Z

Was there a reason to sqaush this implementation with your deferred freeing of textures? imo for the deferred freeing, it's better to just lock this texture for at least a draw call, or just until the next frame, or better don't remove them from the texture cache for at least a frame ( #2001 )

Source/Core/VideoBackends/OGL/TextureCache.cpp

+void TextureCache::ConvertTexture(TextureCache::TCacheEntryBase* entry, TCacheEntryBase* unconverted, void* palette, TlutFormat format)
+{
+	// TODO: Implement.
+	return;


Linktothepast · 2015-02-16T13:34:27Z

Apart from the twilight princess map that is upscaled and working with efb to texture, seems that rogue squadron and rebel strike targeting computer works perfectly fine too with efb to texture, unfortunately those games still need efb to ram for a few effects like distant fog etc. They are quite playable with efb to texture bearing a few such glitches.
Edit: List of affected games
Okami
twilight princess
rogue squadron
rebel strike
FFCC THE CRYSTAL BEARERS

magumagu · 2015-02-16T19:58:01Z

Updated to get rid of the deferred freeing; some quick testing shows it isn't actually necessary. (Hopefully, this doesn't break anything.)

JMC47 · 2015-02-16T19:58:31Z

Metroid Prime 1 won't need EFB2RAM at all.

Metroid Prime 1 - 3 will upscale the other visors with this.

mimimi085181 · 2015-02-18T14:52:57Z

Okami is another game that won't need efb2ram anymore after this. Not even the drawing part needs efb2ram.

Externals/libusb/msvc/libusb_static_2013.vcxproj

@@ -137,7 +137,6 @@
    <ClCompile Include="..\libusb\hotplug.c" />
    <ClCompile Include="..\libusb\io.c" />
    <ClCompile Include="..\libusb\os\poll_windows.c" />
-    <ClCompile Include="..\libusb\strerror.c" />


Linktothepast · 2015-02-18T21:00:02Z

JMC47 Metroid Prime still needs efb to ram, there is texture corruption in the environment without it in the Chozo ruins that i tested regardless of scanner working .

JMC47 · 2015-02-18T21:04:00Z

Is it worth the slowdown at that point to have EFB2RAM on?

Linktothepast · 2015-02-18T21:12:54Z

http://prntscr.com/66uv94 See for yourself and judge, i get something like that all over the place.

Tinob · 2015-02-18T21:17:58Z

@Linktothepast Have you tested increasing cache samples to see if that fixes the issue?

Linktothepast · 2015-02-18T21:23:27Z

Nope, it happens in the safest setting too but seems to be fixed temporarily when moving the slider.

delroth · 2015-02-18T21:30:17Z

@Linktothepast do you happen to have a fifolog of that?

JMC47 · 2015-02-18T21:36:43Z

I haven't run into those bugs in my quick testing of EFB2Tex in Metroid Prime... I guess I'll go through the Chozo Ruins and see what happens.

Linktothepast · 2015-02-18T21:47:14Z

https://www.mediafire.com/?idb9wwef9n1l99m there you go, a five frame fifo, it happens with efb to texture and d3d that i tested (didn't check opengl since the fix is not implemented there).

mimimi085181 · 2015-02-18T21:49:47Z

@Linktothepast: Can you test if this happens the master build as well? It might be unrelated to this PR. If it works there, 1% chance a recent change fixed it, can you test the master version the PR is based on then?

Linktothepast · 2015-02-18T21:53:52Z

Same thing in master unfortunately.

delroth · 2015-02-18T21:56:04Z

Oh, so that shouldn't be considered a blocker for this PR. Cool.

Can someone maybe port it to GL? :) Or at least fix the GL related bugs that it introduces.

Linktothepast · 2015-02-18T22:16:35Z

Eh, no it is not a blocker, i just told jmc that efb to ram is still needed for the game due to the above issue.

magumagu · 2015-02-18T23:26:50Z

Added fallback path for OpenGL; should be unchanged from master.

magumagu · 2015-02-19T02:47:37Z

This could probably use one more round of testing to make sure I didn't break anything merging with PR #2001.

Also, JMC47 discovered an issue with the RS2 pause screen with EFB2Tex; I'm not sure what's causing that.

magumagu · 2015-02-19T05:49:57Z

Figured out what's going on with RS2: it has to do with the interaction between BPMEM_PRELOAD_MODE and EFB copies. The way we implement BPMEM_PRELOAD_MODE is a memcpy from main memory to texMem; however, we don't notify the texcache that this is happening, so it loses track of the relationship. Or rather, it should lose track of the relationship, but on master we use the specified address in main memory as a hint to find the right entry even though it doesn't actually have any meaning (?).

Anyway, I'm going to have to mess with the texture cache side of this a bit more before merging this.

mimimi085181 · 2015-02-19T19:45:19Z

As far as i can tell, the rebase on top of #2001 went well. Tested Castlevania 3, Metroid Prime 3(fonts), New Super Mario Bros, Okami and RS2, all ran as expected of #2001 and this PR.

A number of games make an EFB copy in I4/I8 format, then use it as a texture in C4/C8 format. Detect when this happens, and decode the copy on the GPU using the specified palette. This has a few advantages: it allows using EFB2Tex for a few more games, it, it preserves the resolution of scaled EFB copies, and it's probably a bit faster. D3D only at the moment, but porting to OpenGL should be straightforward..

magumagu · 2015-02-19T23:43:30Z

Rewrote the texture cache stuff; should fix the RS2 regression.

Source/Core/VideoCommon/TextureCacheBase.cpp

+	{
+		// Perform palette decoding.
+		TCacheEntryBase *entry = unconverted_copy->second;
+		TCacheEntryBase *decoded_entry = AllocateTexture(entry->config);


No functional change.

Decode EFB copies used as paletted textures.

Source/Core/VideoCommon/TextureCacheBase.cpp

+		config.rendertarget = true;
+		config.width = entry->config.width;
+		config.height = entry->config.height;
+		config.layers = FramebufferManagerBase::GetEFBLayers();


DarthVitrial · 2015-02-20T20:21:45Z

So, does this PR fix it with OpenGL too, or is that coming in the future?
(Sorry if I'm not supposed to post here)

Made unnecessary by PRs dolphin-emu#2059 and dolphin-emu#2960. MP2 and MP3 still need it.

phire reviewed Feb 16, 2015
View reviewed changes

Source/Core/VideoCommon/TextureCacheBase.h

RAM_PALETTE,

// A texture with two TMEM addresses.

// May be either decoded with a palette or an RGBA8 texture with two parts.

DUAL_TMEM,

This comment was marked as off-topic.

Sign in to view

degasus mentioned this pull request Feb 16, 2015

Allow multiple texture cache entries for textures at the same address #2001

Merged

degasus reviewed Feb 16, 2015
View reviewed changes

magumagu force-pushed the palette-convert branch from f116343 to 1e60187 Compare February 16, 2015 19:56

delroth reviewed Feb 18, 2015
View reviewed changes

magumagu force-pushed the palette-convert branch 3 times, most recently from 29f3fad to 588d9dd Compare February 18, 2015 23:21

magumagu force-pushed the palette-convert branch from 1e5cbb0 to 2e82383 Compare February 19, 2015 02:22

magumagu added 2 commits February 19, 2015 15:09

Remove TextureAddress struct.

ddc815d

magumagu force-pushed the palette-convert branch from 2e82383 to ddc815d Compare February 19, 2015 23:38

degasus reviewed Feb 19, 2015
View reviewed changes

Explicitly set up AllocateTexture configuration for palette conversion.

074397c

No functional change.

delroth added a commit that referenced this pull request Feb 20, 2015

Merge pull request #2059 from magumagu/palette-convert

8b095a0

Decode EFB copies used as paletted textures.

delroth merged commit 8b095a0 into dolphin-emu:master Feb 20, 2015

degasus reviewed Feb 20, 2015
View reviewed changes

Source/Core/VideoCommon/TextureCacheBase.cpp

config.rendertarget = true;

config.width = entry->config.width;

config.height = entry->config.height;

config.layers = FramebufferManagerBase::GetEFBLayers();

This comment was marked as off-topic.

Sign in to view

JosJuice added a commit to JosJuice/dolphin that referenced this pull request Sep 26, 2015

Don't force EFB Copies to Texture Only for Metroid Prime

e721ebe

Made unnecessary by PRs dolphin-emu#2059 and dolphin-emu#2960. MP2 and MP3 still need it.

JosJuice mentioned this pull request Sep 26, 2015

Don't force EFB Copies to Texture Only off for Metroid Prime #3094

Merged

JosJuice added a commit to JosJuice/dolphin that referenced this pull request Sep 26, 2015

Don't force EFB Copies to Texture Only off for Metroid Prime

e754b09

Made unnecessary by PRs dolphin-emu#2059 and dolphin-emu#2960. MP2 and MP3 still need it.

Decode EFB copies used as paletted textures. #2059

Decode EFB copies used as paletted textures. #2059

Conversation

magumagu commented Feb 15, 2015

JMC47 commented Feb 15, 2015

delroth commented Feb 15, 2015

Mullin commented Feb 16, 2015

This comment was marked as off-topic.

degasus commented Feb 16, 2015

This comment was marked as off-topic.

This comment was marked as off-topic.

Linktothepast commented Feb 16, 2015

magumagu commented Feb 16, 2015

JMC47 commented Feb 16, 2015

mimimi085181 commented Feb 18, 2015

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

Linktothepast commented Feb 18, 2015

JMC47 commented Feb 18, 2015

Linktothepast commented Feb 18, 2015

Tinob commented Feb 18, 2015

Linktothepast commented Feb 18, 2015

delroth commented Feb 18, 2015

JMC47 commented Feb 18, 2015

Linktothepast commented Feb 18, 2015

mimimi085181 commented Feb 18, 2015

Linktothepast commented Feb 18, 2015

delroth commented Feb 18, 2015

Linktothepast commented Feb 18, 2015

magumagu commented Feb 18, 2015

magumagu commented Feb 19, 2015

magumagu commented Feb 19, 2015

mimimi085181 commented Feb 19, 2015

magumagu commented Feb 19, 2015

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

DarthVitrial commented Feb 20, 2015