ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NV2A : Renamed `flid_3d` to `flip_3d_cond` (so all condition_variable's have a `_cond` suffix)

This commit is contained in:
PatrickvL 2018-02-06 11:56:47 +01:00
parent 4fb8326384
commit 4716d739e1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/devices/video/EmuNV2A_PGRAPH.cpp
View File

@ -477,7 +477,7 @@ DEVICE_WRITE32(PGRAPH)
NV_PGRAPH_SURFACE_READ_3D) + 1) NV_PGRAPH_SURFACE_READ_3D) + 1)
% GET_MASK(d->pgraph.regs[NV_PGRAPH_SURFACE], % GET_MASK(d->pgraph.regs[NV_PGRAPH_SURFACE],
NV_PGRAPH_SURFACE_MODULO_3D)); NV_PGRAPH_SURFACE_MODULO_3D));
d->pgraph.flip_3d.notify_all(); d->pgraph.flip_3d_cond.notify_all();
} }
break; break;
case NV_PGRAPH_FIFO: case NV_PGRAPH_FIFO:
@ -777,7 +777,7 @@ static void pgraph_method(NV2AState *d,
break; break;
} }
pg->flip_3d.wait(pg->lock); pg->flip_3d_cond.wait(pg->lock);
} }
NV2A_DPRINTF("flip stall done\n"); NV2A_DPRINTF("flip stall done\n");
break; break;
@ -2693,7 +2693,7 @@ void pgraph_init(NV2AState *d)
pg->lock = std::unique_lock<std::mutex>(pg->_lock, std::defer_lock); // was SDL_CreateMutex(); pg->lock = std::unique_lock<std::mutex>(pg->_lock, std::defer_lock); // was SDL_CreateMutex();
//pg->interrupt_cond = SDL_CreateCond(); //pg->interrupt_cond = SDL_CreateCond();
//pg->fifo_access_cond = SDL_CreateCond(); //pg->fifo_access_cond = SDL_CreateCond();
//pg->flip_3d = SDL_CreateCond(); //pg->flip_3d_cond = SDL_CreateCond();
#ifdef COMPILE_OPENGL #ifdef COMPILE_OPENGL
/* fire up opengl */ /* fire up opengl */
@ -2781,7 +2781,7 @@ void pgraph_destroy(PGRAPHState *pg)
SDL_DestroyMutex(pg->lock); SDL_DestroyMutex(pg->lock);
SDL_DestroyCond(pg->interrupt_cond); SDL_DestroyCond(pg->interrupt_cond);
SDL_DestroyCond(pg->fifo_access_cond); SDL_DestroyCond(pg->fifo_access_cond);
SDL_DestroyCond(pg->flip_3d); SDL_DestroyCond(pg->flip_3d_cond);
// glo_set_current(pg->gl_context); // glo_set_current(pg->gl_context);

2
src/devices/video/nv2a.h
View File

@ -321,7 +321,7 @@ typedef struct PGRAPHState {
bool fifo_access; bool fifo_access;
std::condition_variable fifo_access_cond; std::condition_variable fifo_access_cond;
std::condition_variable flip_3d; std::condition_variable flip_3d_cond; // Was flip_3d
unsigned int channel_id; unsigned int channel_id;
bool channel_valid; bool channel_valid;