Move critical section to main ddraw, fix shadow window bug when exiting fullscreen
This commit is contained in:
parent
40f196bc8f
commit
fdf8395dd1
4 changed files with 23 additions and 19 deletions
6
render.c
6
render.c
|
@ -62,7 +62,6 @@ DWORD WINAPI render_main(void)
|
|||
}
|
||||
|
||||
ddraw->render.ev = CreateEvent(NULL, TRUE, FALSE, NULL);
|
||||
InitializeCriticalSection(&ddraw->render.cs);
|
||||
|
||||
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, tex_width, tex_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, tex);
|
||||
glViewport(0, 0, ddraw->render.width, ddraw->render.height);
|
||||
|
@ -93,7 +92,7 @@ DWORD WINAPI render_main(void)
|
|||
}
|
||||
|
||||
/* convert ddraw surface to opengl texture */
|
||||
EnterCriticalSection(&ddraw->render.cs);
|
||||
EnterCriticalSection(&ddraw->cs);
|
||||
if(ddraw->primary && ddraw->primary->palette)
|
||||
{
|
||||
for(i=0; i<ddraw->height; i++)
|
||||
|
@ -104,7 +103,7 @@ DWORD WINAPI render_main(void)
|
|||
}
|
||||
}
|
||||
}
|
||||
LeaveCriticalSection(&ddraw->render.cs);
|
||||
LeaveCriticalSection(&ddraw->cs);
|
||||
|
||||
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, ddraw->width, ddraw->height, GL_RGBA, GL_UNSIGNED_BYTE, tex);
|
||||
|
||||
|
@ -130,7 +129,6 @@ DWORD WINAPI render_main(void)
|
|||
SetEvent(ddraw->render.ev);
|
||||
}
|
||||
|
||||
DeleteCriticalSection(&ddraw->render.cs);
|
||||
CloseHandle(ddraw->render.ev);
|
||||
ddraw->render.ev = NULL;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue