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

test automation clean up 

less #ifdef
force mute audio
don't force vsync
This commit is contained in:
Flyinghead 2021-10-10 16:26:36 +02:00
parent c2caef4ad5
commit 19bd6d0bca
11 changed files with 5 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/hw/naomi/naomi_cart.cpp
View File

@ -613,10 +613,6 @@ std::string Cartridge::GetGameId() {
} }
while (!game_id.empty() && game_id.back() == ' ') while (!game_id.empty() && game_id.back() == ' ')
game_id.pop_back(); game_id.pop_back();
if (RomSize < 0x138)
printf("GAME EEPROM ID: (ROM too small)\n");
else
printf("GAME EEPROM ID: %c%c%c%c\n", RomPtr[0x134], RomPtr[0x135], RomPtr[0x136], RomPtr[0x137]);
return game_id; return game_id;
} }
@ -927,10 +923,6 @@ std::string M2Cartridge::GetGameId()
game_id = std::string((char *)RomPtr + 0x800030, 0x20); game_id = std::string((char *)RomPtr + 0x800030, 0x20);
while (!game_id.empty() && game_id.back() == ' ') while (!game_id.empty() && game_id.back() == ' ')
game_id.pop_back(); game_id.pop_back();
if (RomSize < 0x800138)
printf("m2 GAME EEPROM ID: (ROM too small)\n");
else
printf("m2 GAME EEPROM ID: %c%c%c%c\n", RomPtr[0x800134], RomPtr[0x800135], RomPtr[0x800136], RomPtr[0x800137]);
} }
return game_id; return game_id;
} }

1
core/nullDC.cpp
View File

@ -18,6 +18,7 @@ int flycast_init(int argc, char* argv[])
#if defined(TEST_AUTOMATION) #if defined(TEST_AUTOMATION)
setbuf(stdout, 0); setbuf(stdout, 0);
setbuf(stderr, 0); setbuf(stderr, 0);
settings.aica.muteAudio = true;
#endif #endif
if (!_vmem_reserve()) if (!_vmem_reserve())
{ {

6
core/rend/dx9/dxcontext.cpp
View File

@ -44,14 +44,10 @@ bool DXContext::Init(bool keepCurrentWindow)
d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD;
d3dpp.BackBufferFormat = D3DFMT_UNKNOWN; d3dpp.BackBufferFormat = D3DFMT_UNKNOWN;
d3dpp.EnableAutoDepthStencil = FALSE; // No need for depth/stencil buffer for the backbuffer d3dpp.EnableAutoDepthStencil = FALSE; // No need for depth/stencil buffer for the backbuffer
#ifndef TEST_AUTOMATION
swapOnVSync = !settings.input.fastForwardMode && config::VSync; swapOnVSync = !settings.input.fastForwardMode && config::VSync;
d3dpp.PresentationInterval = swapOnVSync ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE; d3dpp.PresentationInterval = swapOnVSync ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE;
// TODO should be 0 in windowed mode // TODO should be 0 in windowed mode
//d3dpp.FullScreen_RefreshRateInHz = swapOnVSync ? 60 : 0; //d3dpp.FullScreen_RefreshRateInHz = swapOnVSync ? 60 : 0;
#else
d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE; // Present without vsync, maximum unthrottled framerate
#endif
if (FAILED(pD3D->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hWnd, if (FAILED(pD3D->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hWnd,
D3DCREATE_HARDWARE_VERTEXPROCESSING, &d3dpp, &pDevice.get()))) D3DCREATE_HARDWARE_VERTEXPROCESSING, &d3dpp, &pDevice.get())))
return false; return false;
@ -83,7 +79,6 @@ void DXContext::Present()
WARN_LOG(RENDERER, "Present failed %x", result); WARN_LOG(RENDERER, "Present failed %x", result);
else else
{ {
#ifndef TEST_AUTOMATION
if (swapOnVSync != (!settings.input.fastForwardMode && config::VSync)) if (swapOnVSync != (!settings.input.fastForwardMode && config::VSync))
{ {
DEBUG_LOG(RENDERER, "Switch vsync %d", !swapOnVSync); DEBUG_LOG(RENDERER, "Switch vsync %d", !swapOnVSync);
@ -101,7 +96,6 @@ void DXContext::Present()
rend_resize_renderer(); rend_resize_renderer();
} }
} }
#endif
} }
} }

2
core/rend/vulkan/vulkan_context.cpp
View File

@ -764,13 +764,11 @@ void VulkanContext::Present() noexcept
} }
renderDone = false; renderDone = false;
} }
#ifndef TEST_AUTOMATION
if (swapOnVSync == (settings.input.fastForwardMode || !config::VSync)) if (swapOnVSync == (settings.input.fastForwardMode || !config::VSync))
{ {
swapOnVSync = (!settings.input.fastForwardMode && config::VSync); swapOnVSync = (!settings.input.fastForwardMode && config::VSync);
resized = true; resized = true;
} }
#endif
if (resized) if (resized)
try { try {
CreateSwapChain(); CreateSwapChain();

4
core/rend/vulkan/vulkan_context.h
View File

@ -152,11 +152,7 @@ private:
u32 width = 0; u32 width = 0;
u32 height = 0; u32 height = 0;
bool resized = false; bool resized = false;
#ifndef TEST_AUTOMATION
bool swapOnVSync = true; bool swapOnVSync = true;
#else
bool swapOnVSync = false;
#endif
vk::UniqueInstance instance; vk::UniqueInstance instance;
vk::PhysicalDevice physicalDevice; vk::PhysicalDevice physicalDevice;

7
core/wsi/egl.cpp
View File

@ -175,11 +175,7 @@ bool EGLGraphicsContext::Init()
#ifdef TARGET_PANDORA #ifdef TARGET_PANDORA
fbdev = open("/dev/fb0", O_RDONLY); fbdev = open("/dev/fb0", O_RDONLY);
#else #else
#ifndef TEST_AUTOMATION
swapOnVSync = config::VSync; swapOnVSync = config::VSync;
#else
swapOnVSync = false;
#endif
eglSwapInterval(display, (int)swapOnVSync); eglSwapInterval(display, (int)swapOnVSync);
#endif #endif
@ -212,15 +208,12 @@ void EGLGraphicsContext::Term()
void EGLGraphicsContext::Swap() void EGLGraphicsContext::Swap()
{ {
#ifdef TEST_AUTOMATION
do_swap_automation(); do_swap_automation();
#else
if (swapOnVSync == (settings.input.fastForwardMode || !config::VSync)) if (swapOnVSync == (settings.input.fastForwardMode || !config::VSync))
{ {
swapOnVSync = (!settings.input.fastForwardMode && config::VSync); swapOnVSync = (!settings.input.fastForwardMode && config::VSync);
eglSwapInterval(display, (int)swapOnVSync); eglSwapInterval(display, (int)swapOnVSync);
} }
#endif
eglSwapBuffers(display, surface); eglSwapBuffers(display, surface);
} }
#endif // USE_EGL #endif // USE_EGL

4
core/wsi/gl_context.h
View File

@ -21,7 +21,11 @@
#pragma once #pragma once
#include "types.h" #include "types.h"
#ifdef TEST_AUTOMATION
void do_swap_automation(); void do_swap_automation();
#else
static inline void do_swap_automation() {}
#endif
class GLGraphicsContext class GLGraphicsContext
{ {

2
core/wsi/osx.cpp
View File

@ -25,9 +25,7 @@ OSXGraphicsContext theGLContext;
void OSXGraphicsContext::Swap() void OSXGraphicsContext::Swap()
{ {
#ifdef TEST_AUTOMATION
do_swap_automation(); do_swap_automation();
#endif
} }
#endif #endif

8
core/wsi/sdl.cpp
View File

@ -78,13 +78,8 @@ bool SDLGLGraphicsContext::Init()
INFO_LOG(RENDERER, "Created SDL Window and GL Context successfully"); INFO_LOG(RENDERER, "Created SDL Window and GL Context successfully");
SDL_GL_MakeCurrent(window, glcontext); SDL_GL_MakeCurrent(window, glcontext);
#ifndef TEST_AUTOMATION
// Swap at vsync // Swap at vsync
swapOnVSync = config::VSync; swapOnVSync = config::VSync;
#else
// Swap immediately
swapOnVSync = false;
#endif
swapInterval = 1; swapInterval = 1;
int displayIndex = SDL_GetWindowDisplayIndex(window); int displayIndex = SDL_GetWindowDisplayIndex(window);
if (displayIndex < 0) if (displayIndex < 0)
@ -117,15 +112,12 @@ bool SDLGLGraphicsContext::Init()
void SDLGLGraphicsContext::Swap() void SDLGLGraphicsContext::Swap()
{ {
#ifdef TEST_AUTOMATION
do_swap_automation(); do_swap_automation();
#else
if (swapOnVSync == (settings.input.fastForwardMode || !config::VSync)) if (swapOnVSync == (settings.input.fastForwardMode || !config::VSync))
{ {
swapOnVSync = (!settings.input.fastForwardMode && config::VSync); swapOnVSync = (!settings.input.fastForwardMode && config::VSync);
SDL_GL_SetSwapInterval(swapOnVSync ? swapInterval : 0); SDL_GL_SetSwapInterval(swapOnVSync ? swapInterval : 0);
} }
#endif
SDL_GL_SwapWindow(window); SDL_GL_SwapWindow(window);
// Check if drawable has been resized // Check if drawable has been resized

2
core/wsi/wgl.cpp
View File

@ -122,9 +122,7 @@ bool WGLGraphicsContext::Init()
void WGLGraphicsContext::Swap() void WGLGraphicsContext::Swap()
{ {
#ifdef TEST_AUTOMATION
do_swap_automation(); do_swap_automation();
#endif
wglSwapLayerBuffers(ourWindowHandleToDeviceContext, WGL_SWAP_MAIN_PLANE); wglSwapLayerBuffers(ourWindowHandleToDeviceContext, WGL_SWAP_MAIN_PLANE);
} }

7
core/wsi/xgl.cpp
View File

@ -83,11 +83,7 @@ bool XGLGraphicsContext::Init()
unsigned int tempu; unsigned int tempu;
XGetGeometry(display, window, &win, &temp, &temp, (u32 *)&settings.display.width, (u32 *)&settings.display.height, &tempu, &tempu); XGetGeometry(display, window, &win, &temp, &temp, (u32 *)&settings.display.width, (u32 *)&settings.display.height, &tempu, &tempu);
#ifndef TEST_AUTOMATION
swapOnVSync = config::VSync; swapOnVSync = config::VSync;
#else
swapOnVSync = false;
#endif
glXSwapIntervalMESA = (int (*)(unsigned))glXGetProcAddress((const GLubyte*)"glXSwapIntervalMESA"); glXSwapIntervalMESA = (int (*)(unsigned))glXGetProcAddress((const GLubyte*)"glXSwapIntervalMESA");
if (glXSwapIntervalMESA != nullptr) if (glXSwapIntervalMESA != nullptr)
glXSwapIntervalMESA((unsigned)swapOnVSync); glXSwapIntervalMESA((unsigned)swapOnVSync);
@ -156,9 +152,7 @@ bool XGLGraphicsContext::ChooseVisual(Display* x11Display, XVisualInfo** visual,
void XGLGraphicsContext::Swap() void XGLGraphicsContext::Swap()
{ {
#ifdef TEST_AUTOMATION
do_swap_automation(); do_swap_automation();
#else
if (swapOnVSync == (settings.input.fastForwardMode || !config::VSync)) if (swapOnVSync == (settings.input.fastForwardMode || !config::VSync))
{ {
swapOnVSync = (!settings.input.fastForwardMode && config::VSync); swapOnVSync = (!settings.input.fastForwardMode && config::VSync);
@ -167,7 +161,6 @@ void XGLGraphicsContext::Swap()
else if (glXSwapIntervalEXT != nullptr) else if (glXSwapIntervalEXT != nullptr)
glXSwapIntervalEXT(display, window, (int)swapOnVSync); glXSwapIntervalEXT(display, window, (int)swapOnVSync);
} }
#endif
glXSwapBuffers(display, window); glXSwapBuffers(display, window);
Window win; Window win;