#316 fix crash on opengl 1.1

FunkyFr3sh · FunkyFr3sh · commit 40a9ff30360b · 2024-12-12T19:10:34.000+01:00
diff --git a/src/render_ogl.c b/src/render_ogl.c
@@ -934,6 +934,11 @@ static void ogl_render()
     {
         glEnable(GL_TEXTURE_2D);
     }
+    else // 8 bpp only works with a shader (opengl 2.0 or above)
+    {
+        g_ogl.use_opengl = FALSE;
+        return;
+    }
 
     DWORD timeout = g_config.minfps > 0 ? g_ddraw.minfps_tick_len : INFINITE;
 
@@ -1155,7 +1160,9 @@ static void ogl_render()
             }
         }
 
-        glActiveTexture(GL_TEXTURE0);
+        if (glActiveTexture)
+            glActiveTexture(GL_TEXTURE0);
+
         glBindTexture(GL_TEXTURE_2D, g_ogl.surface_tex_ids[tex_index]);
 
         if (g_ddraw.bpp == 8)

Original file line number	Diff line number	Diff line change
`@@ -934,6 +934,11 @@ static void ogl_render()`
`934`	`934`	`{`
`935`	`935`	`glEnable(GL_TEXTURE_2D);`
`936`	`936`	`}`
	`937`	`+ else // 8 bpp only works with a shader (opengl 2.0 or above)`
	`938`	`+ {`
	`939`	`+ g_ogl.use_opengl = FALSE;`
	`940`	`+ return;`
	`941`	`+ }`
`937`	`942`
`938`	`943`	`DWORD timeout = g_config.minfps > 0 ? g_ddraw.minfps_tick_len : INFINITE;`
`939`	`944`
`@@ -1155,7 +1160,9 @@ static void ogl_render()`
`1155`	`1160`	`}`
`1156`	`1161`	`}`
`1157`	`1162`
`1158`		`- glActiveTexture(GL_TEXTURE0);`
	`1163`	`+ if (glActiveTexture)`
	`1164`	`+ glActiveTexture(GL_TEXTURE0);`
	`1165`	`+`
`1159`	`1166`	`glBindTexture(GL_TEXTURE_2D, g_ogl.surface_tex_ids[tex_index]);`
`1160`	`1167`
`1161`	`1168`	`if (g_ddraw.bpp == 8)`