osd/tools: msvc fixes

* xinput.h depends on windows.h
* avoid use of non-standard variable-length arrays
This commit is contained in:
Patrick Mackinlay 2023-02-01 10:00:25 +07:00
parent 8518c84215
commit c4830168a5
3 changed files with 3 additions and 2 deletions

View File

@ -11,6 +11,7 @@
#include <memory>
#include <windows.h>
#include <xinput.h>

View File

@ -571,7 +571,7 @@ void shaders::begin_frame(render_primitive_list *primlist)
std::fill(std::begin(target_to_screen), std::end(target_to_screen), 0);
std::fill(std::begin(targets_per_screen), std::end(targets_per_screen), 0);
render_container *containers[std::size(target_to_screen)];
render_container *containers[sizeof(target_to_screen)/sizeof(*target_to_screen)];
// Maximum potential runtime O(max_num_targets^2)
num_targets = 0;

View File

@ -518,7 +518,7 @@ public:
// loop over channels and read the samples
int channels = unsigned((std::min<std::size_t>)(m_info.channels, std::size(m_audio)));
int16_t *samplesptr[std::size(m_audio)];
int16_t *samplesptr[sizeof(m_audio)/sizeof(*m_audio)];
for (int chnum = 0; chnum < channels; chnum++)
{
// read the sound samples