Check for ARB_instanced_arrays explicitly

flibitijibibo · May 9, 2015 · 213c964 · 213c964
1 parent a1b4303
commit 213c964
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Graphics/OpenGLDevice_GL.cs b/src/Graphics/OpenGLDevice_GL.cs
@@ -1059,8 +1059,12 @@ private void LoadGLEntryPoints()
 				throw new NoSuitableGraphicsDeviceException("OpenGL framebuffer support is required!");
 			}
 
-			/* ARB_instanced_arrays/ARB_draw_instanced are almost optional. */
-			SupportsHardwareInstancing = true;
+			/* ARB_instanced_arrays/ARB_draw_instanced are almost optional.
+			 * While we do not directly call glVertexAttribDivisor ourselves,
+			 * we still need to check for ARB_instanced_arrays support.
+			 * -flibit
+			 */
+			SupportsHardwareInstancing = SDL.SDL_GL_GetProcAddress("glVertexAttribDivisor") != IntPtr.Zero;
 			try
 			{
 				glDrawElementsInstanced = (DrawElementsInstanced) Marshal.GetDelegateForFunctionPointer(