mirror of
https://github.com/FunkyFr3sh/cnc-ddraw.git
synced 2025-03-15 06:04:49 +01:00
only enable GL_TEXTURE_2D if no shader available
This commit is contained in:
parent
52bc5ad23f
commit
4fbd905276
@ -401,7 +401,8 @@ DWORD WINAPI render_main(void)
|
||||
|
||||
BOOL useOpenGL = !(ddraw->autorenderer && (!paletteConvProgram || glGetError() != GL_NO_ERROR));
|
||||
|
||||
glEnable(GL_TEXTURE_2D);
|
||||
if (!paletteConvProgram)
|
||||
glEnable(GL_TEXTURE_2D);
|
||||
|
||||
while (useOpenGL && ddraw->render.run && WaitForSingleObject(ddraw->render.sem, INFINITE) != WAIT_FAILED)
|
||||
{
|
||||
@ -525,10 +526,8 @@ DWORD WINAPI render_main(void)
|
||||
if (paletteConvProgram)
|
||||
{
|
||||
glActiveTexture(GL_TEXTURE0);
|
||||
glEnable(GL_TEXTURE_2D);
|
||||
glBindTexture(GL_TEXTURE_2D, surfaceTexId);
|
||||
glActiveTexture(GL_TEXTURE1);
|
||||
glEnable(GL_TEXTURE_2D);
|
||||
glBindTexture(GL_TEXTURE_2D, paletteTexId);
|
||||
glActiveTexture(GL_TEXTURE0);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user