[Scummvm-git-logs] scummvm master -> 81cddd4e77e62f044e4e7e4ff7e1a48f5acd8b56
criezy
criezy at scummvm.org
Mon Mar 29 19:50:57 UTC 2021
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e31734bfaa AGS: Remove waitingForNextTick() because it's no longer used
81cddd4e77 AGS: Remove obsolete loopTimer argument from gfx renderers
Commit: e31734bfaa42a02197984ce39b95d1d9b7fd9066
https://github.com/scummvm/scummvm/commit/e31734bfaa42a02197984ce39b95d1d9b7fd9066
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-03-29T20:41:35+01:00
Commit Message:
AGS: Remove waitingForNextTick() because it's no longer used
Cherry-picked from adventuregamestudio/ags c3bd303d88
Changed paths:
engines/ags/engine/ac/timer.cpp
engines/ags/engine/ac/timer.h
diff --git a/engines/ags/engine/ac/timer.cpp b/engines/ags/engine/ac/timer.cpp
index ba33907fea..179b725698 100644
--- a/engines/ags/engine/ac/timer.cpp
+++ b/engines/ags/engine/ac/timer.cpp
@@ -76,38 +76,6 @@ void WaitForNextFrame() {
::AGS::g_vm->_rawScreen->update();
}
-bool waitingForNextTick() {
- auto now = AGS_Clock::now();
-
- if (_G(framerate_maxed)) {
- _G(last_tick_time) = now;
- return false;
- }
-
- auto is_lagging = (now - _G(last_tick_time)) > (MAXIMUM_FALL_BEHIND * _G(tick_duration));
- if (is_lagging) {
-#if AGS_PLATFORM_DEBUG && defined (__GNUC__)
- auto missed_ticks = ((now - _G(last_tick_time)) / _G(tick_duration));
- warning("Lagging! Missed %lld ticks!\n", (int64)missed_ticks);
-/* void *array[10];
- auto size = backtrace(array, 10);
- backtrace_symbols_fd(array, size, STDOUT_FILENO);
-*/
- warning("\n");
-#endif
- _G(last_tick_time) = now;
- return false;
- }
-
- auto next_tick_time = _G(last_tick_time) + _G(tick_duration);
- if (next_tick_time <= now) {
- _G(last_tick_time) = next_tick_time;
- return false;
- }
-
- return true;
-}
-
void skipMissedTicks() {
_G(last_tick_time) = AGS_Clock::now();
_G(next_frame_timestamp) = AGS_Clock::now();
diff --git a/engines/ags/engine/ac/timer.h b/engines/ags/engine/ac/timer.h
index 28c5df9c08..d094a3e235 100644
--- a/engines/ags/engine/ac/timer.h
+++ b/engines/ags/engine/ac/timer.h
@@ -43,8 +43,8 @@ extern void WaitForNextFrame();
extern void setTimerFps(int new_fps);
// Tells whether maxed FPS mode is currently set
extern bool isTimerFpsMaxed();
-extern bool waitingForNextTick(); // store last tick time.
-extern void skipMissedTicks(); // if more than N frames, just skip all, start a fresh.
+// if more than N frames, just skip all, start a fresh.
+extern void skipMissedTicks();
} // namespace AGS3
Commit: 81cddd4e77e62f044e4e7e4ff7e1a48f5acd8b56
https://github.com/scummvm/scummvm/commit/81cddd4e77e62f044e4e7e4ff7e1a48f5acd8b56
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-03-29T20:50:06+01:00
Commit Message:
AGS: Remove obsolete loopTimer argument from gfx renderers
Cherry-picked from adventuregamestudio/ags 7005bd21bc
Changed paths:
engines/ags/engine/gfx/ali3dscummvm.cpp
engines/ags/engine/gfx/ali3dscummvm.h
engines/ags/engine/gfx/gfxdriverbase.cpp
engines/ags/engine/gfx/gfxdriverbase.h
engines/ags/engine/gfx/graphicsdriver.h
engines/ags/engine/main/graphics_mode.cpp
diff --git a/engines/ags/engine/gfx/ali3dscummvm.cpp b/engines/ags/engine/gfx/ali3dscummvm.cpp
index b1bc0ba1ca..eb8e275831 100644
--- a/engines/ags/engine/gfx/ali3dscummvm.cpp
+++ b/engines/ags/engine/gfx/ali3dscummvm.cpp
@@ -166,7 +166,7 @@ void ALScummVMGraphicsDriver::SetTintMethod(TintMethod method) {
// TODO: support new D3D-style tint method
}
-bool ALScummVMGraphicsDriver::SetDisplayMode(const DisplayMode &mode, volatile int *loopTimer) {
+bool ALScummVMGraphicsDriver::SetDisplayMode(const DisplayMode &mode) {
ReleaseDisplayMode();
const int driver = GetAllegroGfxDriverID(mode.Windowed);
@@ -179,7 +179,7 @@ bool ALScummVMGraphicsDriver::SetDisplayMode(const DisplayMode &mode, volatile i
if (!IsModeSupported(mode) || set_gfx_mode(driver, mode.Width, mode.Height, 0, 0) != 0)
return false;
- OnInit(loopTimer);
+ OnInit();
OnModeSet(mode);
// set_gfx_mode is an allegro function that creates screen bitmap;
diff --git a/engines/ags/engine/gfx/ali3dscummvm.h b/engines/ags/engine/gfx/ali3dscummvm.h
index f2c8607a34..075369525a 100644
--- a/engines/ags/engine/gfx/ali3dscummvm.h
+++ b/engines/ags/engine/gfx/ali3dscummvm.h
@@ -165,7 +165,7 @@ public:
return "Software";
}
void SetTintMethod(TintMethod method) override;
- bool SetDisplayMode(const DisplayMode &mode, volatile int *loopTimer) override;
+ bool SetDisplayMode(const DisplayMode &mode) override;
bool SetNativeSize(const Size &src_size) override;
bool SetRenderFrame(const Rect &dst_rect) override;
bool IsModeSupported(const DisplayMode &mode) override;
diff --git a/engines/ags/engine/gfx/gfxdriverbase.cpp b/engines/ags/engine/gfx/gfxdriverbase.cpp
index 11b2b85efc..80511143e2 100644
--- a/engines/ags/engine/gfx/gfxdriverbase.cpp
+++ b/engines/ags/engine/gfx/gfxdriverbase.cpp
@@ -84,7 +84,7 @@ void GraphicsDriverBase::ClearDrawLists() {
_spriteBatchDesc.resize(1);
}
-void GraphicsDriverBase::OnInit(volatile int *loopTimer) {
+void GraphicsDriverBase::OnInit() {
}
void GraphicsDriverBase::OnUnInit() {
diff --git a/engines/ags/engine/gfx/gfxdriverbase.h b/engines/ags/engine/gfx/gfxdriverbase.h
index 5241a76d36..33df30c4f3 100644
--- a/engines/ags/engine/gfx/gfxdriverbase.h
+++ b/engines/ags/engine/gfx/gfxdriverbase.h
@@ -127,7 +127,7 @@ public:
protected:
// Called after graphics driver was initialized for use for the first time
- virtual void OnInit(volatile int *loopTimer);
+ virtual void OnInit();
// Called just before graphics mode is going to be uninitialized and its
// resources released
virtual void OnUnInit();
diff --git a/engines/ags/engine/gfx/graphicsdriver.h b/engines/ags/engine/gfx/graphicsdriver.h
index 1c7a9da216..11ebddba25 100644
--- a/engines/ags/engine/gfx/graphicsdriver.h
+++ b/engines/ags/engine/gfx/graphicsdriver.h
@@ -93,7 +93,7 @@ public:
virtual const char *GetDriverID() = 0;
virtual void SetTintMethod(TintMethod method) = 0;
// Initialize given display mode
- virtual bool SetDisplayMode(const DisplayMode &mode, volatile int *loopTimer) = 0;
+ virtual bool SetDisplayMode(const DisplayMode &mode) = 0;
// Gets if a graphics mode was initialized
virtual bool IsModeSet() const = 0;
// Set the size of the native image size
diff --git a/engines/ags/engine/main/graphics_mode.cpp b/engines/ags/engine/main/graphics_mode.cpp
index 36153b71b4..69ec7a2488 100644
--- a/engines/ags/engine/main/graphics_mode.cpp
+++ b/engines/ags/engine/main/graphics_mode.cpp
@@ -524,7 +524,7 @@ bool graphics_mode_set_dm(const DisplayMode &dm) {
if (dm.RefreshRate >= 50)
request_refresh_rate(dm.RefreshRate);
- if (!_G(gfxDriver)->SetDisplayMode(dm, nullptr)) {
+ if (!_G(gfxDriver)->SetDisplayMode(dm)) {
Debug::Printf(kDbgMsg_Error, "Failed to init gfx mode. Error: %s", get_allegro_error());
return false;
}
More information about the Scummvm-git-logs
mailing list