Skip to content

Fix fallback to CPU timer #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChasBoyd merged 1 commit into from
Nov 9, 2021
Merged

Fix fallback to CPU timer #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 12 additions & 16 deletions Game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
//*********************************************************

#define versionString L"v0.961"
#define versionString L"v0.962"

#include "pch.h"

Expand Down Expand Up @@ -800,35 +800,26 @@ void Game::Tick()
static_cast<uint32_t>(m_mediaPresentDuration), &closestSmallerDuration, &closestLargerDuration);

// Check that one of the neighboring Durations matches our goal
if (hr == S_OK && (closestLargerDuration != 0 || closestSmallerDuration != 0))
if (hr == S_OK && (m_mediaPresentDuration == closestLargerDuration || m_mediaPresentDuration == closestSmallerDuration))
{
if ((m_mediaPresentDuration - closestSmallerDuration) < (closestLargerDuration - m_mediaPresentDuration))
{
m_mediaPresentDuration = closestSmallerDuration;
}
else
{
m_mediaPresentDuration = closestLargerDuration;
}

// then the rate is valid and we can set it
hr = scMedia->SetPresentDuration(static_cast<uint32_t>(m_mediaPresentDuration));
if (hr != S_OK)
{
m_mediaPresentDuration = 0;
}
}
else
{
// PresentDuration is not to be used
m_mediaPresentDuration = 0;
}
}
}
else
{
// PresentDuration is not to be used
m_mediaPresentDuration = 0;

if (m_vTotalFixedApproved)
{
scMedia->SetPresentDuration(0);
}
}

hr = scMedia->GetFrameStatisticsMedia(&mediaStats);
Expand All @@ -843,6 +834,11 @@ void Game::Tick()

// if we didnt get PresentDuration mode, maybe we got an MPO:
m_MPO = false;
if (m_vTotalFixedSupported && m_vTotalFixedApproved)
{
scMedia->SetPresentDuration(0);
}

if (mediaStats.CompositionMode == DXGI_FRAME_PRESENTATION_MODE_OVERLAY)
{
m_MPO = true;
Expand Down