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

save error state before we reset it on texture creation

Browse Source
This commit is contained in:
FunkyFr3sh 2018-09-11 18:08:36 +02:00
parent 79fe86062f
commit 93c240d31f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/render.c
View File

@ -137,6 +137,8 @@ DWORD WINAPI render_main(void)
if (gotOpenglV3) if (gotOpenglV3)
scaleProgram = OpenGL_BuildProgramFromFile(ddraw->shader); scaleProgram = OpenGL_BuildProgramFromFile(ddraw->shader);
BOOL GotError = FALSE;
// primary surface texture // primary surface texture
GLenum surfaceFormat = GL_LUMINANCE; GLenum surfaceFormat = GL_LUMINANCE;
GLuint surfaceTexIds[TEXTURE_COUNT]; GLuint surfaceTexIds[TEXTURE_COUNT];
@ -150,6 +152,8 @@ DWORD WINAPI render_main(void)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
GotError = GotError || glGetError() != GL_NO_ERROR;
while (glGetError() != GL_NO_ERROR); while (glGetError() != GL_NO_ERROR);
if (paletteConvProgram) if (paletteConvProgram)
@ -440,7 +444,7 @@ DWORD WINAPI render_main(void)
glBindFramebuffer(GL_FRAMEBUFFER, 0); glBindFramebuffer(GL_FRAMEBUFFER, 0);
} }
BOOL useOpenGL = !(ddraw->autorenderer && (!paletteConvProgram || glGetError() != GL_NO_ERROR)); BOOL useOpenGL = !(ddraw->autorenderer && (!paletteConvProgram || GotError || glGetError() != GL_NO_ERROR));
if (!paletteConvProgram) if (!paletteConvProgram)
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);