From 7b0d834477b92cfa60bf9e4fb4268772d65c3104 Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Sun, 25 Aug 2019 03:54:09 +0300 Subject: [PATCH] Use g_fxo for gem_camera_shared --- rpcs3/Emu/Cell/Modules/cellCamera.cpp | 2 +- rpcs3/Emu/Cell/Modules/cellGem.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellCamera.cpp b/rpcs3/Emu/Cell/Modules/cellCamera.cpp index 39e0973e71..64160f2e26 100644 --- a/rpcs3/Emu/Cell/Modules/cellCamera.cpp +++ b/rpcs3/Emu/Cell/Modules/cellCamera.cpp @@ -1051,7 +1051,7 @@ s32 cellCameraReadEx(s32 dev_num, vm::ptr read) read->frame = g_camera->frame_num; read->bytesread = g_camera->is_streaming ? get_video_buffer_size(g_camera->info) : 0; - auto shared_data = fxm::get_always(); + auto shared_data = g_fxo->get(); shared_data->frame_timestamp.exchange(read->timestamp); } diff --git a/rpcs3/Emu/Cell/Modules/cellGem.cpp b/rpcs3/Emu/Cell/Modules/cellGem.cpp index d44e03010a..fe9b5caa18 100644 --- a/rpcs3/Emu/Cell/Modules/cellGem.cpp +++ b/rpcs3/Emu/Cell/Modules/cellGem.cpp @@ -546,7 +546,7 @@ s32 cellGemGetImageState(u32 gem_num, vm::ptr image_state) if (g_cfg.io.move == move_handler::fake) { - auto shared_data = fxm::get_always(); + auto shared_data = g_fxo->get(); image_state->frame_timestamp = shared_data->frame_timestamp.load(); image_state->timestamp = image_state->frame_timestamp + 10; // arbitrarily define 10 usecs of frame processing