From 4716d739e1e615b3448d87930114c0ee05707589 Mon Sep 17 00:00:00 2001 From: PatrickvL Date: Tue, 6 Feb 2018 11:56:47 +0100 Subject: [PATCH] NV2A : Renamed `flid_3d` to `flip_3d_cond` (so all condition_variable's have a `_cond` suffix) --- src/devices/video/EmuNV2A_PGRAPH.cpp | 8 ++++---- src/devices/video/nv2a.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/devices/video/EmuNV2A_PGRAPH.cpp b/src/devices/video/EmuNV2A_PGRAPH.cpp index 60b5491f4..5fed6c278 100644 --- a/src/devices/video/EmuNV2A_PGRAPH.cpp +++ b/src/devices/video/EmuNV2A_PGRAPH.cpp @@ -477,7 +477,7 @@ DEVICE_WRITE32(PGRAPH) NV_PGRAPH_SURFACE_READ_3D) + 1) % GET_MASK(d->pgraph.regs[NV_PGRAPH_SURFACE], NV_PGRAPH_SURFACE_MODULO_3D)); - d->pgraph.flip_3d.notify_all(); + d->pgraph.flip_3d_cond.notify_all(); } break; case NV_PGRAPH_FIFO: @@ -777,7 +777,7 @@ static void pgraph_method(NV2AState *d, break; } - pg->flip_3d.wait(pg->lock); + pg->flip_3d_cond.wait(pg->lock); } NV2A_DPRINTF("flip stall done\n"); break; @@ -2693,7 +2693,7 @@ void pgraph_init(NV2AState *d) pg->lock = std::unique_lock(pg->_lock, std::defer_lock); // was SDL_CreateMutex(); //pg->interrupt_cond = SDL_CreateCond(); //pg->fifo_access_cond = SDL_CreateCond(); - //pg->flip_3d = SDL_CreateCond(); + //pg->flip_3d_cond = SDL_CreateCond(); #ifdef COMPILE_OPENGL /* fire up opengl */ @@ -2781,7 +2781,7 @@ void pgraph_destroy(PGRAPHState *pg) SDL_DestroyMutex(pg->lock); SDL_DestroyCond(pg->interrupt_cond); SDL_DestroyCond(pg->fifo_access_cond); - SDL_DestroyCond(pg->flip_3d); + SDL_DestroyCond(pg->flip_3d_cond); // glo_set_current(pg->gl_context); diff --git a/src/devices/video/nv2a.h b/src/devices/video/nv2a.h index 7c4e5fba5..b2199df8a 100644 --- a/src/devices/video/nv2a.h +++ b/src/devices/video/nv2a.h @@ -321,7 +321,7 @@ typedef struct PGRAPHState { bool fifo_access; std::condition_variable fifo_access_cond; - std::condition_variable flip_3d; + std::condition_variable flip_3d_cond; // Was flip_3d unsigned int channel_id; bool channel_valid;