Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #947 enable bloom on mac (commented hardcoded "not for mac" gl ext stuff)

Browse source
This commit is contained in:
rti 2010-06-09 01:05:24 +02:00
parent d1d248def0
commit b9e7923226
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
View file

@ -620,10 +620,12 @@ static bool setupATITextureEnvCombine3(const char *glext)
{ {
H_AUTO_OGL(setupATITextureEnvCombine3); H_AUTO_OGL(setupATITextureEnvCombine3);
#ifdef NL_OS_MAC // reenabled to allow bloom on mac, TODO: cleanly fix the water issue
// Water doesn't render on GeForce 8600M GT (on MAC OS X) if this extension is enabled // i think this issue was mtp target related - is this the case in ryzom too?
return false; // #ifdef NL_OS_MAC
#endif // // 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"); CHECK_EXT("GL_ATI_texture_env_combine3");
return true; return true;
@ -671,10 +673,12 @@ static bool setupNVVertexProgram(const char *glext)
{ {
H_AUTO_OGL(setupNVVertexProgram); H_AUTO_OGL(setupNVVertexProgram);
#ifdef NL_OS_MAC // reenabled to allow bloom on mac, TODO: cleanly fix the water issue
// Water doesn't render on GeForce 8600M GT (on MAC OS X) if this extension is enabled // i think this issue was mtp target related - is this the case in ryzom too?
return false; // #ifdef NL_OS_MAC
#endif // // 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_EXT("GL_NV_vertex_program");
CHECK_ADDRESS(NEL_PFNGLAREPROGRAMSRESIDENTNVPROC, glAreProgramsResidentNV); CHECK_ADDRESS(NEL_PFNGLAREPROGRAMSRESIDENTNVPROC, glAreProgramsResidentNV);
@ -882,10 +886,12 @@ static bool setupNVTextureShader(const char *glext)
{ {
H_AUTO_OGL(setupNVTextureShader); H_AUTO_OGL(setupNVTextureShader);
#ifdef NL_OS_MAC // reenabled to allow bloom on mac, TODO: cleanly fix the water issue
// Water doesn't render on GeForce 8600M GT (on MAC OS X) if this extension is enabled // i think this issue was mtp target related - is this the case in ryzom too?
return false; // #ifdef NL_OS_MAC
#endif // // 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"); CHECK_EXT("GL_NV_texture_shader");
return true; return true;