Skip to content

Commit

Permalink
Remove Immediate XFB from DTM header
Browse files Browse the repository at this point in the history
7f0834c, which added the Immediate DTM setting, also added a byte
to DTM headers for Immediate DTM. There are two problems with this:

1. The byte was added in the middle of the header, throwing off the
   offsets of several other settings. There are programs other than
   Dolphin itself that parse DTM files, so this is not acceptable.

2. If I'm not mistaken, Immediate XFB doesn't affect sync. Putting
   it in the DTM header unnecessarily prevents people from using
   a different value for that setting than what the movie author used.
  • Loading branch information
JosJuice committed Nov 19, 2017
1 parent 80bcc0d commit 79a36c2
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 5 deletions.
2 changes: 0 additions & 2 deletions Source/Core/Core/ConfigLoaders/MovieConfigLoader.cpp
Expand Up @@ -42,7 +42,6 @@ static void LoadFromDTM(Config::Layer* config_layer, Movie::DTMHeader* dtm)
config_layer->Set(Config::GFX_HACK_EFB_ACCESS_ENABLE, dtm->bEFBAccessEnable);
config_layer->Set(Config::GFX_HACK_SKIP_EFB_COPY_TO_RAM, dtm->bSkipEFBCopyToRam);
config_layer->Set(Config::GFX_HACK_SKIP_XFB_COPY_TO_RAM, dtm->bSkipXFBCopyToRam);
config_layer->Set(Config::GFX_HACK_IMMEDIATE_XFB, dtm->bImmediateXFB);
config_layer->Set(Config::GFX_HACK_EFB_EMULATE_FORMAT_CHANGES, dtm->bEFBEmulateFormatChanges);
}

Expand All @@ -65,7 +64,6 @@ void SaveToDTM(Movie::DTMHeader* dtm)
dtm->bEFBAccessEnable = Config::Get(Config::GFX_HACK_EFB_ACCESS_ENABLE);
dtm->bSkipEFBCopyToRam = Config::Get(Config::GFX_HACK_SKIP_EFB_COPY_TO_RAM);
dtm->bSkipXFBCopyToRam = Config::Get(Config::GFX_HACK_SKIP_XFB_COPY_TO_RAM);
dtm->bImmediateXFB = Config::Get(Config::GFX_HACK_IMMEDIATE_XFB);
dtm->bEFBEmulateFormatChanges = Config::Get(Config::GFX_HACK_EFB_EMULATE_FORMAT_CHANGES);

// This never used the regular config
Expand Down
1 change: 0 additions & 1 deletion Source/Core/Core/Movie.cpp
Expand Up @@ -1368,7 +1368,6 @@ void SetGraphicsConfig()
g_Config.bEFBAccessEnable = tmpHeader.bEFBAccessEnable;
g_Config.bSkipEFBCopyToRam = tmpHeader.bSkipEFBCopyToRam;
g_Config.bSkipXFBCopyToRam = tmpHeader.bSkipXFBCopyToRam;
g_Config.bImmediateXFB = tmpHeader.bImmediateXFB;
g_Config.bEFBEmulateFormatChanges = tmpHeader.bEFBEmulateFormatChanges;
}

Expand Down
3 changes: 1 addition & 2 deletions Source/Core/Core/Movie.h
Expand Up @@ -88,7 +88,6 @@ struct DTMHeader
bool bEFBCopyEnable;
bool bSkipEFBCopyToRam;
bool bSkipXFBCopyToRam;
bool bImmediateXFB;
bool bEFBCopyCacheEnable;
bool bEFBEmulateFormatChanges;
u8 memcards; // Memcards inserted (from least to most significant, the bits are slot A and B)
Expand All @@ -98,7 +97,7 @@ struct DTMHeader
bool bNetPlay;
bool bPAL60;
u8 language;
u8 reserved[11]; // Padding for any new config options
u8 reserved[12]; // Padding for any new config options
u8 discChange[40]; // Name of iso file to switch to, for two disc games.
u8 revision[20]; // Git hash
u32 DSPiromHash;
Expand Down

0 comments on commit 79a36c2

Please sign in to comment.