Fix Draw benchmark behavior, add FPS benchmark

[olanti-p]

Summary

SUMMARY: Infrastructure "Added separate benchmark for 'Draws per second' as opposed to existing 'Frames per second'"

Purpose of change

This came up in #251.

After migration to ui_adaptor, "Draw benchmark (X seconds)" went from measuring number of redraws (g->draw()) per second to number of redraws + window refreshes (g->draw() + refresh_window()) per second. Window refresh is a blocking operation, with block time depending on the OS, and therefore may skew with the benchmark results.

This PR reverts the behavior of the "Draw benchmark" back to how it worked before the migration, and adds "FPS benchmark" that retains the current behavior.

Describe the solution

Changed the code to call refresh_window() only when measuring FPS.
Also, moved popup creation out of measuring code (!!!), and made the game actually display it during draw benchmark.

Describe alternatives you've considered

Just removing refresh_window() call, but then I realized that FPS benchmark may be useful too.

Testing

With opengl renderer, my Kubuntu 20.04 caps FPS benchmark at 60 (due to synchronization), but Draw benchmark shows 140.

[Coolthulhu]

Some of the compilers complain about missing declaration.
Do you have access to Travis build results from here?

[olanti-p]

I do. Fixed it (hopefully).

[Coolthulhu]

Damn, I'm getting really poor FPS on those. Could be just my (profiled) builds, but still, 30 FPS on a 2D game is pathetic.

[olanti-p]

Yeah. I had to zoom in and resize the window to minimum to get it up to 60/140, normally it's 25-35.

[Coolthulhu]

I'm reading cata_tiles::draw and it looks like calling it a drawing benchmark would be misleading: most of the function (by CPU usage) is actually recalculating vision cache.

[olanti-p]

Dunno. It doesn't take (on Windows 10 x64, with software renderer) very much:

Unlike, say, the minimap:

Which is somewhat better with direct3d11:

The duplicate map cache rebuild also seems to be costly - I believe DDA had a bunch of PRs dealing with it

[Coolthulhu]

with software renderer

On Linux+opengl, I'm not seeing any draw calls in top 10 of gprof output. Though I'm not sure how trustworthy is it.

The duplicate map cache rebuild also seems to be costly - I believe DDA had a bunch of PRs dealing with it

Probably worth grabbing, I'll look into it.