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

fix for msvc 2013 / C++14. Rend is now used by stdlib

This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis 2014-12-17 06:48:45 +01:00
parent defc25e9c1
commit e43271e448
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/hw/pvr/Renderer_if.cpp
View File

@ -62,7 +62,7 @@
u32 VertexCount=0;
u32 FrameCount=1;
Renderer* rend;
Renderer* renderer;
cResetEvent rs(false,true);
cResetEvent re(false,true);
@ -83,13 +83,13 @@ bool rend_single_frame()
}
while (!_pvrrc);
bool proc = rend->Process(_pvrrc);
bool proc = renderer->Process(_pvrrc);
re.Set();
bool do_swp = proc && rend->Render();
bool do_swp = proc && renderer->Render();
if (do_swp)
rend->DrawOSD();
renderer->DrawOSD();
//clear up & free data ..
FinishRender(_pvrrc);
@ -128,15 +128,15 @@ void* rend_thread(void* p)
if (!rend->Init())
if (!renderer->Init())
die("rend->init() failed\n");
rend->Resize(640,480);
renderer->Resize(640, 480);
for(;;)
{
if (rend_single_frame())
rend->Present();
renderer->Present();
}
}
@ -220,13 +220,13 @@ bool rend_init()
{
#if NO_REND
rend = rend_norend();
renderer = rend_norend();
#else
#if HOST_OS == OS_WINDOWS
rend = settings.pvr.rend == 0 ? rend_GLES2() : rend_D3D11() ;
renderer = settings.pvr.rend == 0 ? rend_GLES2() : rend_D3D11();
#else
rend = rend_GLES2();
renderer = rend_GLES2();
#endif
#endif