From 3fb630c5711bbf3f44c4555d5d2bfbb1536cfe7d Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 20 Apr 2017 10:15:11 +0200
Subject: [PATCH] Get rid of is_perfcnt_enable for audio_driver_write function

---
 audio/audio_driver.c           | 10 +++++-----
 audio/audio_driver.h           |  3 +--
 audio/audio_thread_wrapper.c   |  6 ++----
 audio/drivers/alsa.c           |  3 +--
 audio/drivers/alsa_qsa.c       |  3 +--
 audio/drivers/alsathread.c     |  3 +--
 audio/drivers/coreaudio.c      |  3 +--
 audio/drivers/ctr_csnd_audio.c |  8 +-------
 audio/drivers/ctr_dsp_audio.c  |  8 +-------
 audio/drivers/dsound.c         |  3 +--
 audio/drivers/gx_audio.c       |  3 +--
 audio/drivers/jack.c           |  3 +--
 audio/drivers/nullaudio.c      |  3 +--
 audio/drivers/openal.c         |  3 +--
 audio/drivers/opensl.c         |  3 +--
 audio/drivers/oss.c            |  3 +--
 audio/drivers/ps3_audio.c      |  3 +--
 audio/drivers/psp_audio.c      |  3 +--
 audio/drivers/pulse.c          |  3 +--
 audio/drivers/roar.c           |  3 +--
 audio/drivers/rsound.c         |  3 +--
 audio/drivers/rwebaudio.c      |  3 +--
 audio/drivers/sdl_audio.c      |  5 ++---
 audio/drivers/wiiu_audio.c     | 10 +---------
 audio/drivers/xaudio.cpp       | 10 ++++------
 audio/drivers/xenon360_audio.c |  3 +--
 26 files changed, 35 insertions(+), 79 deletions(-)

diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index b445d407b7..f78a50c55a 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -510,7 +510,6 @@ static bool audio_driver_flush(const int16_t *data, size_t samples)
    static struct retro_perf_counter audio_convert_s16   = {0};
    const void *output_data                              = NULL;
    unsigned output_frames                               = 0;
-   size_t   output_size                                 = sizeof(float);
    settings_t *settings                                 = config_get_ptr();
 
    src_data.data_in                                     = NULL;
@@ -609,7 +608,9 @@ static bool audio_driver_flush(const int16_t *data, size_t samples)
    output_data   = audio_driver_output_samples_buf;
    output_frames = (unsigned)src_data.output_frames;
 
-   if (!audio_driver_use_float)
+   if (audio_driver_use_float)
+      output_frames *= sizeof(float);
+   else
    {
       static struct retro_perf_counter audio_convert_float = {0};
 
@@ -620,12 +621,11 @@ static bool audio_driver_flush(const int16_t *data, size_t samples)
       performance_counter_stop_plus(is_perfcnt_enable, audio_convert_float);
 
       output_data = audio_driver_output_samples_conv_buf;
-      output_size = sizeof(int16_t);
+      output_frames *= sizeof(int16_t);
    }
 
    if (current_audio->write(audio_driver_context_audio_data,
-            output_data, output_frames * output_size * 2,
-            is_perfcnt_enable) < 0)
+            output_data, output_frames * 2) < 0)
    {
       audio_driver_active = false;
       return false;
diff --git a/audio/audio_driver.h b/audio/audio_driver.h
index 3b86b01ffb..4e4bc795cd 100644
--- a/audio/audio_driver.h
+++ b/audio/audio_driver.h
@@ -67,8 +67,7 @@ typedef struct audio_driver
     * Unless said otherwise with set_nonblock_state(), all writes
     * are blocking, and it should block till it has written all frames.
     */
-   ssize_t (*write)(void *data, const void *buf, size_t size,
-         bool is_perfcnt_enable);
+   ssize_t (*write)(void *data, const void *buf, size_t size);
 
    /* Temporarily pauses the audio driver. */
    bool (*stop)(void *data);
diff --git a/audio/audio_thread_wrapper.c b/audio/audio_thread_wrapper.c
index 01f4bcdf18..196fd201c6 100644
--- a/audio/audio_thread_wrapper.c
+++ b/audio/audio_thread_wrapper.c
@@ -228,8 +228,7 @@ static bool audio_thread_use_float(void *data)
    return thr->use_float;
 }
 
-static ssize_t audio_thread_write(void *data, const void *buf, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t audio_thread_write(void *data, const void *buf, size_t size)
 {
    ssize_t ret;
    audio_thread_t *thr = (audio_thread_t*)data;
@@ -237,8 +236,7 @@ static ssize_t audio_thread_write(void *data, const void *buf, size_t size,
    if (!thr)
       return 0;
 
-   ret = thr->driver->write(thr->driver_data, buf, size,
-         is_perfcnt_enable);
+   ret = thr->driver->write(thr->driver_data, buf, size);
 
    if (ret < 0)
    {
diff --git a/audio/drivers/alsa.c b/audio/drivers/alsa.c
index fedc34f4fc..15d85a233f 100644
--- a/audio/drivers/alsa.c
+++ b/audio/drivers/alsa.c
@@ -173,8 +173,7 @@ error:
    return NULL;
 }
 
-static ssize_t alsa_write(void *data, const void *buf_, size_t size_,
-      bool is_perfcnt_enable)
+static ssize_t alsa_write(void *data, const void *buf_, size_t size_)
 {
    alsa_t *alsa              = (alsa_t*)data;
    const uint8_t *buf        = (const uint8_t*)buf_;
diff --git a/audio/drivers/alsa_qsa.c b/audio/drivers/alsa_qsa.c
index 21f30abe1e..ef0fbab51d 100644
--- a/audio/drivers/alsa_qsa.c
+++ b/audio/drivers/alsa_qsa.c
@@ -219,8 +219,7 @@ static int check_pcm_status(void *data, int channel_type)
 }
 
 
-static ssize_t alsa_qsa_write(void *data, const void *buf, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t alsa_qsa_write(void *data, const void *buf, size_t size)
 {
    alsa_t              *alsa = (alsa_t*)data;
    snd_pcm_sframes_t written = 0;
diff --git a/audio/drivers/alsathread.c b/audio/drivers/alsathread.c
index 5dc7b1e868..5ea11f2d0d 100644
--- a/audio/drivers/alsathread.c
+++ b/audio/drivers/alsathread.c
@@ -243,8 +243,7 @@ error:
    return NULL;
 }
 
-static ssize_t alsa_thread_write(void *data, const void *buf, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t alsa_thread_write(void *data, const void *buf, size_t size)
 {
    alsa_thread_t *alsa = (alsa_thread_t*)data;
 
diff --git a/audio/drivers/coreaudio.c b/audio/drivers/coreaudio.c
index 9f26ac4d65..02ff2c6b9a 100644
--- a/audio/drivers/coreaudio.c
+++ b/audio/drivers/coreaudio.c
@@ -337,8 +337,7 @@ error:
    return NULL;
 }
 
-static ssize_t coreaudio_write(void *data, const void *buf_, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t coreaudio_write(void *data, const void *buf_, size_t size)
 {
    coreaudio_t *dev   = (coreaudio_t*)data;
    const uint8_t *buf = (const uint8_t*)buf_;
diff --git a/audio/drivers/ctr_csnd_audio.c b/audio/drivers/ctr_csnd_audio.c
index b0f5baaed5..21d7a8bea9 100644
--- a/audio/drivers/ctr_csnd_audio.c
+++ b/audio/drivers/ctr_csnd_audio.c
@@ -163,8 +163,7 @@ static void ctr_csnd_audio_free(void *data)
    free(ctr);
 }
 
-static ssize_t ctr_csnd_audio_write(void *data, const void *buf, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t ctr_csnd_audio_write(void *data, const void *buf, size_t size)
 {
    int i;
    uint32_t samples_played                     = 0;
@@ -178,9 +177,6 @@ static ssize_t ctr_csnd_audio_write(void *data, const void *buf, size_t size,
    (void)samples_played;
    (void)current_tick;
 
-   performance_counter_init(ctraudio_f, "ctraudio_f");
-   performance_counter_start_plus(is_perfcnt_enable, ctraudio_f);
-
    ctr_csnd_audio_update_playpos(ctr);
 
    if((((ctr->playpos  - ctr->pos) & CTR_CSND_AUDIO_COUNT_MASK) < (CTR_CSND_AUDIO_COUNT >> 2)) ||
@@ -211,8 +207,6 @@ static ssize_t ctr_csnd_audio_write(void *data, const void *buf, size_t size,
    GSPGPU_FlushDataCache(ctr->l, CTR_CSND_AUDIO_SIZE);
    GSPGPU_FlushDataCache(ctr->r, CTR_CSND_AUDIO_SIZE);
 
-   performance_counter_stop_plus(is_perfcnt_enable, ctraudio_f);
-
    return size;
 }
 
diff --git a/audio/drivers/ctr_dsp_audio.c b/audio/drivers/ctr_dsp_audio.c
index e7bbadd14a..2c459c552b 100644
--- a/audio/drivers/ctr_dsp_audio.c
+++ b/audio/drivers/ctr_dsp_audio.c
@@ -93,8 +93,7 @@ static void ctr_dsp_audio_free(void *data)
    ndspExit();
 }
 
-static ssize_t ctr_dsp_audio_write(void *data, const void *buf, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t ctr_dsp_audio_write(void *data, const void *buf, size_t size)
 {
    u32 pos;
    static struct retro_perf_counter ctraudio_dsp_f = {0};
@@ -117,9 +116,6 @@ static ssize_t ctr_dsp_audio_write(void *data, const void *buf, size_t size,
       }
    }
 
-   performance_counter_init(ctraudio_dsp_f, "ctraudio_dsp_f");
-   performance_counter_start_plus(is_perfcnt_enable, ctraudio_dsp_f);
-
    pos = ctr->pos << 2;
 
    if((pos + size) > CTR_DSP_AUDIO_SIZE)
@@ -141,8 +137,6 @@ static ssize_t ctr_dsp_audio_write(void *data, const void *buf, size_t size,
    ctr->pos += size >> 2;
    ctr->pos &= CTR_DSP_AUDIO_COUNT_MASK;
 
-   performance_counter_stop_plus(is_perfcnt_enable, ctraudio_dsp_f);
-
    return size;
 }
 
diff --git a/audio/drivers/dsound.c b/audio/drivers/dsound.c
index 33faf28877..1af78d9c15 100644
--- a/audio/drivers/dsound.c
+++ b/audio/drivers/dsound.c
@@ -426,8 +426,7 @@ static void dsound_set_nonblock_state(void *data, bool state)
       ds->nonblock = state;
 }
 
-static ssize_t dsound_write(void *data, const void *buf_, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t dsound_write(void *data, const void *buf_, size_t size)
 {
    size_t     written = 0;
    dsound_t       *ds = (dsound_t*)data;
diff --git a/audio/drivers/gx_audio.c b/audio/drivers/gx_audio.c
index c93c552bce..7453060881 100644
--- a/audio/drivers/gx_audio.c
+++ b/audio/drivers/gx_audio.c
@@ -116,8 +116,7 @@ static INLINE void copy_swapped(uint32_t * restrict dst,
    }while(--size);
 }
 
-static ssize_t gx_audio_write(void *data, const void *buf_, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t gx_audio_write(void *data, const void *buf_, size_t size)
 {
    size_t       frames = size >> 2;
    const uint32_t *buf = buf_;
diff --git a/audio/drivers/jack.c b/audio/drivers/jack.c
index b3dd64f5ac..a413e34a31 100644
--- a/audio/drivers/jack.c
+++ b/audio/drivers/jack.c
@@ -292,8 +292,7 @@ static size_t write_buffer(jack_t *jd, const float *buf, size_t size)
    return written * sizeof(float) * 2;
 }
 
-static ssize_t ja_write(void *data, const void *buf, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t ja_write(void *data, const void *buf, size_t size)
 {
    jack_t *jd = (jack_t*)data;
 
diff --git a/audio/drivers/nullaudio.c b/audio/drivers/nullaudio.c
index 6d31387dac..d0d9c0d36b 100644
--- a/audio/drivers/nullaudio.c
+++ b/audio/drivers/nullaudio.c
@@ -35,8 +35,7 @@ static void null_audio_free(void *data)
    (void)data;
 }
 
-static ssize_t null_audio_write(void *data, const void *buf, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t null_audio_write(void *data, const void *buf, size_t size)
 {
    (void)data;
    (void)buf;
diff --git a/audio/drivers/openal.c b/audio/drivers/openal.c
index 6214c8a6bb..fc94f78e29 100644
--- a/audio/drivers/openal.c
+++ b/audio/drivers/openal.c
@@ -173,8 +173,7 @@ static size_t al_fill_internal_buf(al_t *al, const void *buf, size_t size)
    return read_size;
 }
 
-static ssize_t al_write(void *data, const void *buf_, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t al_write(void *data, const void *buf_, size_t size)
 {
    al_t           *al = (al_t*)data;
    const uint8_t *buf = (const uint8_t*)buf_;
diff --git a/audio/drivers/opensl.c b/audio/drivers/opensl.c
index 7c9bd739d5..fef08db8f2 100644
--- a/audio/drivers/opensl.c
+++ b/audio/drivers/opensl.c
@@ -230,8 +230,7 @@ static bool sl_start(void *data, bool is_shutdown)
 }
 
 
-static ssize_t sl_write(void *data, const void *buf_, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t sl_write(void *data, const void *buf_, size_t size)
 {
    sl_t           *sl = (sl_t*)data;
    size_t     written = 0;
diff --git a/audio/drivers/oss.c b/audio/drivers/oss.c
index 1f8bd80259..1f8b25cb87 100644
--- a/audio/drivers/oss.c
+++ b/audio/drivers/oss.c
@@ -97,8 +97,7 @@ error:
    return NULL;
 }
 
-static ssize_t oss_write(void *data, const void *buf, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t oss_write(void *data, const void *buf, size_t size)
 {
    ssize_t ret;
    int *fd = (int*)data;
diff --git a/audio/drivers/ps3_audio.c b/audio/drivers/ps3_audio.c
index 104f21a51f..0d4e56e467 100644
--- a/audio/drivers/ps3_audio.c
+++ b/audio/drivers/ps3_audio.c
@@ -146,8 +146,7 @@ static void *ps3_audio_init(const char *device,
    return data;
 }
 
-static ssize_t ps3_audio_write(void *data, const void *buf, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t ps3_audio_write(void *data, const void *buf, size_t size)
 {
    ps3_audio_t *aud = data;
 
diff --git a/audio/drivers/psp_audio.c b/audio/drivers/psp_audio.c
index 6dc9af8eb0..0181c9614a 100644
--- a/audio/drivers/psp_audio.c
+++ b/audio/drivers/psp_audio.c
@@ -184,8 +184,7 @@ static void psp_audio_free(void *data)
    free(psp);
 }
 
-static ssize_t psp_audio_write(void *data, const void *buf, size_t size,
-       bool is_perfcnt_enable)
+static ssize_t psp_audio_write(void *data, const void *buf, size_t size)
 {
    psp_audio_t* psp     = (psp_audio_t*)data;
    uint16_t write_pos   = psp->write_pos;
diff --git a/audio/drivers/pulse.c b/audio/drivers/pulse.c
index e4d0ee32a5..61e47fd08f 100644
--- a/audio/drivers/pulse.c
+++ b/audio/drivers/pulse.c
@@ -236,8 +236,7 @@ error:
    return NULL;
 }
 
-static ssize_t pulse_write(void *data, const void *buf_, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t pulse_write(void *data, const void *buf_, size_t size)
 {
    pa_t           *pa = (pa_t*)data;
    const uint8_t *buf = (const uint8_t*)buf_;
diff --git a/audio/drivers/roar.c b/audio/drivers/roar.c
index b1a2018b7e..7e08f74749 100644
--- a/audio/drivers/roar.c
+++ b/audio/drivers/roar.c
@@ -58,8 +58,7 @@ static void *ra_init(const char *device, unsigned rate, unsigned latency,
    return roar;
 }
 
-static ssize_t ra_write(void *data, const void *buf, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t ra_write(void *data, const void *buf, size_t size)
 {
    int err;
    size_t written = 0;
diff --git a/audio/drivers/rsound.c b/audio/drivers/rsound.c
index 01cae5fb5e..258f42aa2a 100644
--- a/audio/drivers/rsound.c
+++ b/audio/drivers/rsound.c
@@ -102,8 +102,7 @@ error:
    return NULL;
 }
 
-static ssize_t rs_write(void *data, const void *buf, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t rs_write(void *data, const void *buf, size_t size)
 {
    rsd_t *rsd = (rsd_t*)data;
 
diff --git a/audio/drivers/rwebaudio.c b/audio/drivers/rwebaudio.c
index 1806f02fe9..5a90e69233 100644
--- a/audio/drivers/rwebaudio.c
+++ b/audio/drivers/rwebaudio.c
@@ -51,8 +51,7 @@ static void *rwebaudio_init(const char *device, unsigned rate, unsigned latency,
    return data;
 }
 
-static ssize_t rwebaudio_write(void *data, const void *buf, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t rwebaudio_write(void *data, const void *buf, size_t size)
 {
    (void)data;
    return RWebAudioWrite(buf, size);
diff --git a/audio/drivers/sdl_audio.c b/audio/drivers/sdl_audio.c
index a53ecccd03..c2eed35feb 100644
--- a/audio/drivers/sdl_audio.c
+++ b/audio/drivers/sdl_audio.c
@@ -140,10 +140,9 @@ error:
    return NULL;
 }
 
-static ssize_t sdl_audio_write(void *data, const void *buf, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t sdl_audio_write(void *data, const void *buf, size_t size)
 {
-   ssize_t ret = 0;
+   ssize_t ret      = 0;
    sdl_audio_t *sdl = (sdl_audio_t*)data;
 
    if (sdl->nonblock)
diff --git a/audio/drivers/wiiu_audio.c b/audio/drivers/wiiu_audio.c
index 0e56fa211a..98e9e11999 100644
--- a/audio/drivers/wiiu_audio.c
+++ b/audio/drivers/wiiu_audio.c
@@ -192,8 +192,7 @@ static bool ax_audio_start(void* data, bool is_shutdown)
    return true;
 }
 
-static ssize_t ax_audio_write(void* data, const void* buf, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t ax_audio_write(void* data, const void* buf, size_t size)
 {
    int i;
    static struct retro_perf_counter ax_audio_write_perf = {0};
@@ -205,10 +204,6 @@ static ssize_t ax_audio_write(void* data, const void* buf, size_t size,
    if(!size || (size & 0x3))
       return 0;
 
-   /* Measure copy performance from here */
-   performance_counter_init(ax_audio_write_perf, "ax_audio_write");
-   performance_counter_start_plus(is_perfcnt_enable, ax_audio_write_perf);
-
    if(count > AX_AUDIO_MAX_FREE)
       count = AX_AUDIO_MAX_FREE;
 
@@ -286,9 +281,6 @@ static ssize_t ax_audio_write(void* data, const void* buf, size_t size,
    if(!AXIsMultiVoiceRunning(ax->mvoice))
       ax_audio_start(ax, false);
 
-   /* Done copying new data */
-   performance_counter_stop_plus(is_perfcnt_enable, ax_audio_write_perf);
-
    /* return what was actually copied */
    return (count << 2);
 }
diff --git a/audio/drivers/xaudio.cpp b/audio/drivers/xaudio.cpp
index 7304752025..f63be65f77 100644
--- a/audio/drivers/xaudio.cpp
+++ b/audio/drivers/xaudio.cpp
@@ -201,10 +201,9 @@ static size_t xaudio2_write_avail(xaudio2_t *handle)
    return handle->bufsize * (MAX_BUFFERS - handle->buffers - 1);
 }
 
-static size_t xaudio2_write(xaudio2_t *handle, const void *buf, size_t bytes_,
-      bool is_perfcnt_enable)
+static size_t xaudio2_write(xaudio2_t *handle, const void *buf, size_t bytes_)
 {
-   unsigned bytes = bytes_;
+   unsigned bytes        = bytes_;
    const uint8_t *buffer = (const uint8_t*)buf;
 
    while (bytes)
@@ -274,8 +273,7 @@ static void *xa_init(const char *device, unsigned rate, unsigned latency,
    return xa;
 }
 
-static ssize_t xa_write(void *data, const void *buf, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t xa_write(void *data, const void *buf, size_t size)
 {
    size_t ret;
    xa_t *xa = (xa_t*)data;
@@ -290,7 +288,7 @@ static ssize_t xa_write(void *data, const void *buf, size_t size,
          size = avail;
    }
 
-   ret = xaudio2_write(xa->xa, buf, size, is_perfcnt_enable);
+   ret = xaudio2_write(xa->xa, buf, size);
    if (ret == 0 && size > 0)
       return -1;
    return ret;
diff --git a/audio/drivers/xenon360_audio.c b/audio/drivers/xenon360_audio.c
index 6b44947b31..b72e01fc4d 100644
--- a/audio/drivers/xenon360_audio.c
+++ b/audio/drivers/xenon360_audio.c
@@ -57,8 +57,7 @@ static INLINE uint32_t bswap_32(uint32_t val)
       ((val >> 8) & 0xff00) | ((val << 8) & 0xff0000);
 }
 
-static ssize_t xenon360_audio_write(void *data, const void *buf, size_t size,
-      bool is_perfcnt_enable)
+static ssize_t xenon360_audio_write(void *data, const void *buf, size_t size)
 {
    size_t written = 0, i;
    const uint32_t *in_buf = buf;