dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add chicken bit to disable varact2 optimisation

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-05-27 00:37:58 +01:00
parent 72e2ee882e
commit dd2e1fe956
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/debug_settings.h
View File

@@ -20,6 +20,7 @@ enum ChickenBitFlags {
DCBF_DESYNC_CHECK_POST_COMMAND = 3, DCBF_DESYNC_CHECK_POST_COMMAND = 3,
DCBF_DESYNC_CHECK_NO_GENERAL = 4, DCBF_DESYNC_CHECK_NO_GENERAL = 4,
DCBF_DESYNC_CHECK_PERIODIC_SIGNALS = 5, DCBF_DESYNC_CHECK_PERIODIC_SIGNALS = 5,
DCBF_NO_OPTIMISE_VARACT2 = 6,
}; };
inline bool HasChickenBit(ChickenBitFlags flag) inline bool HasChickenBit(ChickenBitFlags flag)

6
src/newgrf.cpp
View File

@@ -49,6 +49,7 @@
#include "vehicle_base.h" #include "vehicle_base.h"
#include "road.h" #include "road.h"
#include "newgrf_roadstop.h" #include "newgrf_roadstop.h"
#include "debug_settings.h"
#include "table/strings.h" #include "table/strings.h"
#include "table/build_industry.h" #include "table/build_industry.h"
@@ -5493,6 +5494,7 @@ static const SpriteGroup *GetGroupFromGroupID(byte setid, byte type, uint16 grou
} }
const SpriteGroup *result = _cur.spritegroups[groupid]; const SpriteGroup *result = _cur.spritegroups[groupid];
if (HasChickenBit(DCBF_NO_OPTIMISE_VARACT2)) return result;
while (result != nullptr) { while (result != nullptr) {
if (result->type == SGT_DETERMINISTIC) { if (result->type == SGT_DETERMINISTIC) {
const DeterministicSpriteGroup *sg = static_cast<const DeterministicSpriteGroup *>(result); const DeterministicSpriteGroup *sg = static_cast<const DeterministicSpriteGroup *>(result);
@@ -5713,7 +5715,9 @@ static void NewSpriteGroup(ByteReader *buf)
current_constant = constant; current_constant = constant;
}; };
if ((prev_inference & VA2AIF_PREV_TERNARY) && adjust.variable == 0x1A && IsEvalAdjustUsableForConstantPropagation(adjust.operation)) { if (HasChickenBit(DCBF_NO_OPTIMISE_VARACT2)) {
/* no optimisation */
} else if ((prev_inference & VA2AIF_PREV_TERNARY) && adjust.variable == 0x1A && IsEvalAdjustUsableForConstantPropagation(adjust.operation)) {
/* Propagate constant operation back into previous ternary */ /* Propagate constant operation back into previous ternary */
DeterministicSpriteGroupAdjust &prev = group->adjusts[group->adjusts.size() - 2]; DeterministicSpriteGroupAdjust &prev = group->adjusts[group->adjusts.size() - 2];
prev.and_mask = EvaluateDeterministicSpriteGroupAdjust(group->size, adjust, nullptr, prev.and_mask, UINT_MAX); prev.and_mask = EvaluateDeterministicSpriteGroupAdjust(group->size, adjust, nullptr, prev.and_mask, UINT_MAX);