all repos — mgba @ d07b4a4a7bc7ea5ccdb741c4b463482afcb77529

mGBA Game Boy Advance Emulator

Libretro: Stop using videoFrame callbacks
Jeffrey Pfau jeffrey@endrift.com
Sat, 12 Sep 2015 00:22:07 -0700
commit

d07b4a4a7bc7ea5ccdb741c4b463482afcb77529

parent

83e23e9cce428677b86e07362b1522f6705e45b9

1 files changed, 2 insertions(+), 10 deletions(-)

jump to
M src/platform/libretro/libretro.csrc/platform/libretro/libretro.c

@@ -30,7 +30,6 @@

static void GBARetroLog(struct GBAThread* thread, enum GBALogLevel level, const char* format, va_list args); static void _postAudioBuffer(struct GBAAVStream*, struct GBAAudio* audio); -static void _postVideoFrame(struct GBAAVStream*, struct GBAVideoRenderer* renderer); static void _setRumble(struct GBARumble* rumble, int enable); static uint8_t _readLux(struct GBALuminanceSource* lux); static void _updateLux(struct GBALuminanceSource* lux);

@@ -155,7 +154,7 @@ }

stream.postAudioFrame = 0; stream.postAudioBuffer = _postAudioBuffer; - stream.postVideoFrame = _postVideoFrame; + stream.postVideoFrame = 0; GBAContextInit(&context, 0); struct GBAOptions opts = {

@@ -235,6 +234,7 @@ }

} GBAContextFrame(&context, keys); + videoCallback(renderer.outputBuffer, VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS, BYTES_PER_PIXEL * renderer.outputBufferStride); } void retro_reset(void) {

@@ -406,14 +406,6 @@ samples[i * 2 + 1] = samplesR[i];

} #endif audioCallback(samples, SAMPLES); -} - -static void _postVideoFrame(struct GBAAVStream* stream, struct GBAVideoRenderer* renderer) { - UNUSED(stream); - const void* pixels; - unsigned stride; - renderer->getPixels(renderer, &stride, &pixels); - videoCallback(pixels, VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS, BYTES_PER_PIXEL * stride); } static void _setRumble(struct GBARumble* rumble, int enable) {