backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-15 06:04:49 +01:00
Code Issues Projects Releases Activity

choose best renderer automatically

Browse Source
This commit is contained in:
FunkyFr3sh 2018-05-18 16:18:34 +02:00
parent 8ba9b570fd
commit fd939bfff4
4 changed files with 53 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inc/main.h
View File

@ -91,6 +91,7 @@ typedef struct IDirectDrawImpl
BOOL fakecursorpos;
BOOL noactivateapp;
char shader[MAX_PATH];
BOOL autorenderer;
} IDirectDrawImpl;

12
src/main.c
View File

@ -978,8 +978,8 @@ HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnk
"adjmouse=false\n"
"; enable C&C video resize hack, auto = auto-detect game, true = forced, false = disabled\n"
"vhack=false\n"
"; switch between OpenGL (opengl) and software (gdi) renderers\n"
"renderer=gdi\n"
"; switch between OpenGL (opengl) and software (gdi) renderers, (auto) = try opengl, fallback = gdi\n"
"renderer=auto\n"
"; force CPU0 affinity, avoids crashes with RA, *might* have a performance impact\n"
"singlecpu=true\n"
"; Window position, -1 = center to screen\n"
@ -1131,7 +1131,7 @@ HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnk
This->vhack = 0;
}
GetPrivateProfileStringA("ddraw", "renderer", "gdi", tmp, sizeof(tmp), SettingsIniPath);
GetPrivateProfileStringA("ddraw", "renderer", "auto", tmp, sizeof(tmp), SettingsIniPath);
if(tolower(tmp[0]) == 'd' || tolower(tmp[0]) == 'd')
{
printf("DirectDrawCreate: Using dummy renderer\n");
@ -1142,6 +1142,12 @@ HRESULT WINAPI DirectDrawCreate(GUID FAR* lpGUID, LPDIRECTDRAW FAR* lplpDD, IUnk
printf("DirectDrawCreate: Using software renderer\n");
This->renderer = render_soft_main;
}
else if (tolower(tmp[0]) == 'a')
{
printf("DirectDrawCreate: Using automatic renderer\n");
This->renderer = render_main;
This->autorenderer = TRUE;
}
else
{
printf("DirectDrawCreate: Using OpenGL renderer\n");

48
src/render.c
View File

@ -46,13 +46,26 @@ const GLchar *PaletteFragShaderSrc =
BOOL detect_cutscene();
DWORD WINAPI render_soft_main(void);
DWORD WINAPI render_main(void)
{
Sleep(500);
HGLRC hRC = wglCreateContext(ddraw->render.hDC);
wglMakeCurrent(ddraw->render.hDC, hRC);
BOOL madeCurrent = hRC && wglMakeCurrent(ddraw->render.hDC, hRC);
if (!madeCurrent || (ddraw->autorenderer && glGetError() != GL_NO_ERROR))
{
if (madeCurrent)
{
wglMakeCurrent(NULL, NULL);
wglDeleteContext(hRC);
}
ddraw->renderer = render_soft_main;
return render_soft_main();
}
OpenGL_Init();
@ -71,18 +84,19 @@ DWORD WINAPI render_main(void)
DWORD tick_start = 0;
DWORD tick_end = 0;
DWORD frame_len = 0;
int maxfps = ddraw->render.maxfps;
if (ddraw->render.maxfps < 0)
ddraw->render.maxfps = ddraw->mode.dmDisplayFrequency;
if (maxfps < 0)
maxfps = ddraw->mode.dmDisplayFrequency;
if (ddraw->render.maxfps == 0)
ddraw->render.maxfps = 125;
if (maxfps == 0)
maxfps = 125;
if (ddraw->render.maxfps >= 1000)
ddraw->render.maxfps = 0;
if (maxfps >= 1000)
maxfps = 0;
if (ddraw->render.maxfps > 0)
frame_len = 1000.0f / ddraw->render.maxfps;
if (maxfps > 0)
frame_len = 1000.0f / maxfps;
int tex_width =
ddraw->width <= 1024 ? 1024 : ddraw->width <= 2048 ? 2048 : ddraw->width <= 4096 ? 4096 : ddraw->width;
@ -247,11 +261,11 @@ DWORD WINAPI render_main(void)
}
glBindTexture(GL_TEXTURE_2D, 0);
glEnable(GL_TEXTURE_2D);
while (ddraw->render.run && WaitForSingleObject(ddraw->render.sem, INFINITE) != WAIT_FAILED)
BOOL useOpenGL = !(ddraw->autorenderer && (!paletteConvProgram || glGetError() != GL_NO_ERROR));
while (useOpenGL && ddraw->render.run && WaitForSingleObject(ddraw->render.sem, INFINITE) != WAIT_FAILED)
{
#if _DEBUG
static DWORD tick_fps = 0;
@ -269,7 +283,7 @@ DWORD WINAPI render_main(void)
float scale_w = (float)ddraw->width / tex_width;
float scale_h = (float)ddraw->height / tex_height;
if (ddraw->render.maxfps > 0)
if (maxfps > 0)
tick_start = timeGetTime();
EnterCriticalSection(&ddraw->cs);
@ -414,7 +428,7 @@ DWORD WINAPI render_main(void)
SwapBuffers(ddraw->render.hDC);
if (ddraw->render.maxfps > 0)
if (maxfps > 0)
{
tick_end = timeGetTime();
@ -453,5 +467,11 @@ DWORD WINAPI render_main(void)
wglMakeCurrent(NULL, NULL);
wglDeleteContext(hRC);
if (!useOpenGL)
{
ddraw->renderer = render_soft_main;
render_soft_main();
}
return 0;
}

17
src/render_soft.c
View File

@ -70,15 +70,16 @@ DWORD WINAPI render_soft_main(void)
DWORD tick_start = 0;
DWORD tick_end = 0;
DWORD frame_len = 0;
int maxfps = ddraw->render.maxfps;
if(ddraw->render.maxfps < 0)
ddraw->render.maxfps = ddraw->mode.dmDisplayFrequency;
if(maxfps < 0)
maxfps = ddraw->mode.dmDisplayFrequency;
if (ddraw->render.maxfps >= 1000)
ddraw->render.maxfps = 0;
if (maxfps >= 1000)
maxfps = 0;
if(ddraw->render.maxfps > 0)
frame_len = 1000.0f / ddraw->render.maxfps;
if(maxfps > 0)
frame_len = 1000.0f / maxfps;
while (ddraw->render.run && WaitForSingleObject(ddraw->render.sem, INFINITE) != WAIT_FAILED)
{
@ -95,7 +96,7 @@ DWORD WINAPI render_soft_main(void)
frame_count++;
#endif
if(ddraw->render.maxfps > 0)
if(maxfps > 0)
{
tick_start = timeGetTime();
}
@ -151,7 +152,7 @@ DWORD WINAPI render_soft_main(void)
LeaveCriticalSection(&ddraw->cs);
if(ddraw->render.maxfps > 0)
if(maxfps > 0)
{
tick_end = timeGetTime();