Fixes for dynamic maximum render time calculation
This fixes two issue that in combination could result in constant frame skips, notably affecting setups with custom Mesa in /usr/local.
Closes #3113 (closed)
cc @doraskayo, @daenzer (small oversight in !3080 (diffs, comment 1772411))
Edited by Robert Mader