From 3047f84f80053e2cbd3ee182d7f4153208e8189a Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 4 Oct 2008 17:42:22 +0000
Subject: [PATCH] disabled GL_ARB_texture_non_power_of_two on Mac OS X because
 all the drivers claim to support it, but it's often unaccelerated or crashes

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8522 d7cf8633-e32d-0410-b094-e92efae38249
---
 vid_shared.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vid_shared.c b/vid_shared.c
index 028b10dc..d538f7cf 100644
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -771,9 +771,12 @@ void VID_CheckExtensions(void)
 // COMMANDLINEOPTION: GL: -nocubemap disables GL_ARB_texture_cube_map (required for bumpmapping)
 	if ((gl_texturecubemap = GL_CheckExtension("GL_ARB_texture_cube_map", NULL, "-nocubemap", false)))
 		qglGetIntegerv(GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB, &gl_max_cube_map_texture_size);
+#ifndef __APPLE__
 	// TODO: blacklist this extension on Radeon X1600-X1950 hardware (they support it only with certain filtering/repeat modes)
+	// LordHavoc: this is blocked on Mac OS X because the drivers claim support but often can't accelerate it or crash when used.
 // COMMANDLINEOPTION: GL: -notexturenonpoweroftwo disables GL_ARB_texture_non_power_of_two (which saves video memory if it is supported, but crashes on some buggy drivers)
 	gl_support_arb_texture_non_power_of_two = GL_CheckExtension("GL_ARB_texture_non_power_of_two", NULL, "-notexturenonpoweroftwo", false);
+#endif
 // COMMANDLINEOPTION: GL: -notexturecompression disables GL_ARB_texture_compression (which saves video memory if it is supported, but can also degrade image quality, see gl_texturecompression cvar documentation for more information)
 	gl_support_texture_compression = GL_CheckExtension("GL_ARB_texture_compression", texturecompressionfuncs, "-notexturecompression", false);
 // COMMANDLINEOPTION: GL: -nocva disables GL_EXT_compiled_vertex_array (renders faster)
-- 
2.39.5