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

don't use glFinish in test functions

Browse Source
This commit is contained in:
FunkyFr3sh 2018-10-16 07:07:49 +02:00
parent 21500ca591
commit 6d90e8395a
3 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ddraw.rc
View File

@ -2,7 +2,7 @@
#define vxstr(a,b,c,d) str(a##.##b##.##c##.##d) #define vxstr(a,b,c,d) str(a##.##b##.##c##.##d)
#define str(s) #s #define str(s) #s
#define VERSION 1,2,1,2 #define VERSION 1,2,1,3
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION VERSION FILEVERSION VERSION

13
src/render.c
View File

@ -517,7 +517,8 @@ static void Render()
ddraw->render.viewport.x, ddraw->render.viewport.y, ddraw->render.viewport.x, ddraw->render.viewport.y,
ddraw->render.viewport.width, ddraw->render.viewport.height); ddraw->render.viewport.width, ddraw->render.viewport.height);
glUseProgram(PaletteProgram); if (PaletteProgram)
glUseProgram(PaletteProgram);
while (UseOpenGL && ddraw->render.run && WaitForSingleObject(ddraw->render.sem, INFINITE) != WAIT_FAILED) while (UseOpenGL && ddraw->render.run && WaitForSingleObject(ddraw->render.sem, INFINITE) != WAIT_FAILED)
{ {
@ -798,12 +799,9 @@ static BOOL TextureUploadTest()
GL_UNSIGNED_BYTE, GL_UNSIGNED_BYTE,
SurfaceTex); SurfaceTex);
glFinish();
memset(SurfaceTex, 0, sizeof(testData)); memset(SurfaceTex, 0, sizeof(testData));
glGetTexImage(GL_TEXTURE_2D, 0, SurfaceFormat, GL_UNSIGNED_BYTE, SurfaceTex); glGetTexImage(GL_TEXTURE_2D, 0, SurfaceFormat, GL_UNSIGNED_BYTE, SurfaceTex);
glFinish();
if (memcmp(SurfaceTex, testData, sizeof(testData)) != 0) if (memcmp(SurfaceTex, testData, sizeof(testData)) != 0)
return FALSE; return FALSE;
@ -824,12 +822,9 @@ static BOOL TextureUploadTest()
GL_UNSIGNED_BYTE, GL_UNSIGNED_BYTE,
SurfaceTex); SurfaceTex);
glFinish();
memset(SurfaceTex, 0, sizeof(testData)); memset(SurfaceTex, 0, sizeof(testData));
glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, SurfaceTex); glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, SurfaceTex);
glFinish();
if (memcmp(SurfaceTex, testData, sizeof(testData)) != 0) if (memcmp(SurfaceTex, testData, sizeof(testData)) != 0)
return FALSE; return FALSE;
@ -909,13 +904,9 @@ static BOOL ShaderTest()
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
glFinish();
glBindTexture(GL_TEXTURE_2D, fboTexId); glBindTexture(GL_TEXTURE_2D, fboTexId);
glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, SurfaceTex); glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, SurfaceTex);
glFinish();
int i; int i;
for (i = 0; i < SurfaceTexHeight * SurfaceTexWidth; i++) for (i = 0; i < SurfaceTexHeight * SurfaceTexWidth; i++)
{ {

18
src/render_d3d9.c
View File

@ -26,17 +26,6 @@ static BOOL CreateResources();
static BOOL SetStates(); static BOOL SetStates();
static BOOL UpdateVertices(BOOL inCutscene); static BOOL UpdateVertices(BOOL inCutscene);
static void SetMaxFPS(); static void SetMaxFPS();
static void Render();
DWORD WINAPI render_d3d9_main(void)
{
Sleep(500);
SetMaxFPS();
Render();
return 0;
}
BOOL Direct3D9_Create() BOOL Direct3D9_Create()
{ {
@ -265,8 +254,12 @@ static void SetMaxFPS()
FrameLength = 1000.0f / MaxFPS; FrameLength = 1000.0f / MaxFPS;
} }
static void Render() DWORD WINAPI render_d3d9_main(void)
{ {
Sleep(500);
SetMaxFPS();
DWORD tickStart = 0; DWORD tickStart = 0;
DWORD tickEnd = 0; DWORD tickEnd = 0;
@ -364,4 +357,5 @@ static void Render()
Sleep(FrameLength - (tickEnd - tickStart)); Sleep(FrameLength - (tickEnd - tickStart));
} }
} }
return 0;
} }