From 59155f18397288cc5a6c77afb4c3538b565192d6 Mon Sep 17 00:00:00 2001
From: rti <none@none>
Date: Wed, 9 Jun 2010 01:05:24 +0200
Subject: [PATCH] Changed: #947 enable bloom on mac (commented hardcoded "not
 for mac" gl ext stuff)

---
 .../driver/opengl/driver_opengl_extension.cpp | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
index 62732625c..346218a99 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
@@ -620,10 +620,12 @@ static bool	setupATITextureEnvCombine3(const char	*glext)
 {
 	H_AUTO_OGL(setupATITextureEnvCombine3);
 
-#ifdef NL_OS_MAC
-// Water doesn't render on GeForce 8600M GT (on MAC OS X) if this extension is enabled
-	return false;
-#endif
+// reenabled to allow bloom on mac, TODO: cleanly fix the water issue
+// i think this issue was mtp target related - is this the case in ryzom too?
+// #ifdef NL_OS_MAC
+// // Water doesn't render on GeForce 8600M GT (on MAC OS X) if this extension is enabled
+// 	return false;
+// #endif
 
 	CHECK_EXT("GL_ATI_texture_env_combine3");
 	return true;
@@ -671,10 +673,12 @@ static bool	setupNVVertexProgram(const char	*glext)
 {
 	H_AUTO_OGL(setupNVVertexProgram);
 
-#ifdef NL_OS_MAC
-// Water doesn't render on GeForce 8600M GT (on MAC OS X) if this extension is enabled
-	return false;
-#endif
+// reenabled to allow bloom on mac, TODO: cleanly fix the water issue
+// i think this issue was mtp target related - is this the case in ryzom too?
+// #ifdef NL_OS_MAC
+// // Water doesn't render on GeForce 8600M GT (on MAC OS X) if this extension is enabled
+// 	return false;
+// #endif
 
 	CHECK_EXT("GL_NV_vertex_program");
 	CHECK_ADDRESS(NEL_PFNGLAREPROGRAMSRESIDENTNVPROC, glAreProgramsResidentNV);
@@ -882,10 +886,12 @@ static bool	setupNVTextureShader(const char	*glext)
 {
 	H_AUTO_OGL(setupNVTextureShader);
 
-#ifdef NL_OS_MAC
-// Water doesn't render on GeForce 8600M GT (on MAC OS X) if this extension is enabled
-	return false;
-#endif
+// reenabled to allow bloom on mac, TODO: cleanly fix the water issue
+// i think this issue was mtp target related - is this the case in ryzom too?
+// #ifdef NL_OS_MAC
+// // Water doesn't render on GeForce 8600M GT (on MAC OS X) if this extension is enabled
+// 	return false;
+// #endif
 
 	CHECK_EXT("GL_NV_texture_shader");
 	return true;