AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Windows fixes

This commit is contained in:
Jack Andersen 2018-02-02 17:08:10 -10:00
parent 93fc2d8072
commit 5e8f4d4f12
4 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
NESEmulator/CNESEmulator.cpp
View File

@ -37,17 +37,18 @@ extern "C"
* of the MIT license. See the LICENSE file for details. * of the MIT license. See the LICENSE file for details.
*/ */
#define WINDOWS_BUILD 1
#define DEBUG_HZ 0 #define DEBUG_HZ 0
#define DEBUG_MAIN_CALLS 0 #define DEBUG_MAIN_CALLS 0
#define DEBUG_KEY 0 #define DEBUG_KEY 0
#define DEBUG_LOAD_INFO 1 #define DEBUG_LOAD_INFO 1
#ifndef _WIN32
std::chrono::steady_clock::time_point s_tp = std::chrono::steady_clock::now(); std::chrono::steady_clock::time_point s_tp = std::chrono::steady_clock::now();
static std::chrono::milliseconds::rep GetTickCount() static std::chrono::milliseconds::rep GetTickCount()
{ {
return std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - s_tp).count(); return std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - s_tp).count();
} }
#endif
static const char *VERSION_STRING = "fixNES Alpha v1.0.5"; static const char *VERSION_STRING = "fixNES Alpha v1.0.5";
static char window_title[256]; static char window_title[256];
@ -87,10 +88,6 @@ static bool inResize = false;
static bool inDiskSwitch = false; static bool inDiskSwitch = false;
static bool inReset = false; static bool inReset = false;
#if WINDOWS_BUILD
//#include <windows.h>
//typedef bool (APIENTRY *PFNWGLSWAPINTERVALEXTPROC) (int interval);
//PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT = NULL;
#if DEBUG_HZ #if DEBUG_HZ
static int emuFrameStart = 0; static int emuFrameStart = 0;
static int emuTimesCalled = 0; static int emuTimesCalled = 0;
@ -102,7 +99,6 @@ static int emuMainTimesCalled = 0;
static int emuMainTimesSkipped = 0; static int emuMainTimesSkipped = 0;
static int emuMainTotalElapsed = 0; static int emuMainTotalElapsed = 0;
#endif #endif
#endif
#define DOTS 341 #define DOTS 341
@ -239,14 +235,12 @@ void CNESEmulator::InitializeEmulator()
sprintf(window_title, "%s NES - %s\n", nesPAL ? "PAL" : "NTSC", VERSION_STRING); sprintf(window_title, "%s NES - %s\n", nesPAL ? "PAL" : "NTSC", VERSION_STRING);
sprintf(window_title_pause, "%s (Pause)", window_title); sprintf(window_title_pause, "%s (Pause)", window_title);
#if WINDOWS_BUILD
#if DEBUG_HZ #if DEBUG_HZ
emuFrameStart = GetTickCount(); emuFrameStart = GetTickCount();
#endif #endif
#if DEBUG_MAIN_CALLS #if DEBUG_MAIN_CALLS
emuMainFrameStart = GetTickCount(); emuMainFrameStart = GetTickCount();
#endif #endif
#endif
cpuCycleTimer = nesPAL ? 16 : 12; cpuCycleTimer = nesPAL ? 16 : 12;
//do full frame per update loop //do full frame per update loop
ppuCycleTimer = nesPAL ? 5 : 4; ppuCycleTimer = nesPAL ? 5 : 4;
@ -386,7 +380,7 @@ size_t CNESEmulator::supplyAudio(boo::IAudioVoice& voice, size_t frames, int16_t
return frames; return frames;
} }
#define CATCHUP_SKIP 1 #define CATCHUP_SKIP 0
#if CATCHUP_SKIP #if CATCHUP_SKIP
static int catchupFrames = 0; static int catchupFrames = 0;
#endif #endif
@ -399,7 +393,7 @@ void CNESEmulator::NesEmuMainLoop()
{ {
if((!emuSkipVsync && emuRenderFrame) || nesPause) if((!emuSkipVsync && emuRenderFrame) || nesPause)
{ {
#if (WINDOWS_BUILD && DEBUG_MAIN_CALLS) #if DEBUG_MAIN_CALLS
emuMainTimesSkipped++; emuMainTimesSkipped++;
#endif #endif
//printf("LC RENDER: %d\n", loopCount); //printf("LC RENDER: %d\n", loopCount);
@ -420,7 +414,7 @@ void CNESEmulator::NesEmuMainLoop()
{ {
if(!apuCycle()) if(!apuCycle())
{ {
#if (WINDOWS_BUILD && DEBUG_MAIN_CALLS) #if DEBUG_MAIN_CALLS
emuMainTimesSkipped++; emuMainTimesSkipped++;
#endif #endif
#if CATCHUP_SKIP #if CATCHUP_SKIP
@ -459,7 +453,7 @@ void CNESEmulator::NesEmuMainLoop()
emuRenderFrame = true; emuRenderFrame = true;
if(fm2playRunning()) if(fm2playRunning())
fm2playUpdate(); fm2playUpdate();
#if (WINDOWS_BUILD && DEBUG_HZ) #if DEBUG_HZ
emuTimesCalled++; emuTimesCalled++;
int end = GetTickCount(); int end = GetTickCount();
emuTotalElapsed += end - emuFrameStart; emuTotalElapsed += end - emuFrameStart;
@ -507,10 +501,12 @@ void CNESEmulator::NesEmuMainLoop()
} }
while(true); while(true);
#if 0
int end = GetTickCount(); int end = GetTickCount();
printf("%dms\n", end - start); printf("%dms\n", end - start);
#endif
#if (WINDOWS_BUILD && DEBUG_MAIN_CALLS) #if DEBUG_MAIN_CALLS
emuMainTimesCalled++; emuMainTimesCalled++;
int end = GetTickCount(); int end = GetTickCount();
//printf("%dms\n", end - start); //printf("%dms\n", end - start);

17
NESEmulator/CNESShader.cpp
View File

@ -198,10 +198,10 @@ boo::ObjToken<boo::IShaderDataBinding> CNESShader::BuildShaderDataBinding(boo::I
boo::ObjToken<boo::IGraphicsBufferD> uniBuf, boo::ObjToken<boo::IGraphicsBufferD> uniBuf,
boo::ObjToken<boo::ITextureD> tex) boo::ObjToken<boo::ITextureD> tex)
{ {
boo::ObjToken<boo::IGraphicsBuffer> bufs[] = {filter.m_uniBuf.get()}; boo::ObjToken<boo::IGraphicsBuffer> bufs[] = {uniBuf.get()};
boo::ObjToken<boo::ITexture> texs[] = {filter.m_booTex.get()}; boo::ObjToken<boo::ITexture> texs[] = {tex.get()};
return cctx.newShaderDataBinding(SelectPipeline(type, filter.m_gequal), s_VtxFmt, return ctx.newShaderDataBinding(g_Pipeline, g_VtxFmt,
filter.m_vbo.get(), nullptr, nullptr, 1, bufs, vbo.get(), nullptr, nullptr, 1, bufs,
nullptr, nullptr, nullptr, 1, texs, nullptr, nullptr); nullptr, nullptr, nullptr, 1, texs, nullptr, nullptr);
} }
#endif #endif
@ -253,11 +253,10 @@ boo::ObjToken<boo::IShaderDataBinding> CNESShader::BuildShaderDataBinding(boo::V
boo::ObjToken<boo::IGraphicsBufferD> uniBuf, boo::ObjToken<boo::IGraphicsBufferD> uniBuf,
boo::ObjToken<boo::ITextureD> tex) boo::ObjToken<boo::ITextureD> tex)
{ {
boo::ObjToken<boo::IGraphicsBuffer> bufs[] = {filter.m_uniBuf.get()}; boo::ObjToken<boo::IGraphicsBuffer> bufs[] = {uniBuf.get()};
boo::ObjToken<boo::ITexture> texs[] = {filter.m_booTex.get()}; boo::ObjToken<boo::ITexture> texs[] = {tex.get()};
return cctx.newShaderDataBinding(SelectPipeline(type, filter.m_gequal, return ctx.newShaderDataBinding(g_Pipeline, g_VtxFmt,
filter.m_booTex->type() == boo::TextureType::Render), s_VtxFmt, vbo.get(), nullptr, nullptr, 1, bufs,
filter.m_vbo.get(), nullptr, nullptr, 1, bufs,
nullptr, nullptr, nullptr, 1, texs, nullptr, nullptr); nullptr, nullptr, nullptr, 1, texs, nullptr, nullptr);
} }
#endif #endif

4
NESEmulator/malloc.h
View File

@ -3,8 +3,10 @@
#ifdef __APPLE__ #ifdef __APPLE__
#include <stdlib.h> #include <stdlib.h>
#elif _WIN32
#include <../ucrt/malloc.h>
#else #else
#include <../include/malloc.h> #include_next <malloc.h>
#endif #endif
#endif // URDE_NESEMULATOR_MALLOC_H #endif // URDE_NESEMULATOR_MALLOC_H

2
hecl

@ -1 +1 @@
Subproject commit 3454e81f97ae951b85cd4a9e18bb800f6123163e Subproject commit e45ccd7b55d525080fdc1b87e5e055bd9b9e9fba