Show
Ignore:
Timestamp:
03/13/10 19:09:26 (4 years ago)
Author:
paulmartz
Message:

Merge 10664 to 2.8 branch (MSFBO workaround for OS X).

Location:
OpenSceneGraph/branches/OpenSceneGraph-2.8
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/branches/OpenSceneGraph-2.8

    • Property svn:mergeinfo set to /OpenSceneGraph/branches/OpenSceneGraph-2.8.2:10664
  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgUtil/CMakeLists.txt

    r8211 r11208  
    66    ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC) 
    77ENDIF(DYNAMIC_OPENSCENEGRAPH) 
     8 
     9 
     10# 
     11# MSFBO resolve blit to depth buffer control. 
     12# 
     13OPTION(OSG_MULTISAMPLE_FBO_RESOLVE_IGNORES_DEPTH "Set to ON to ignore depth when resolving multisampled FBO rendering. This is a workaround for a crash on OS X with NVIDIA driver 1.5.49." OFF) 
     14IF(OSG_MULTISAMPLE_FBO_RESOLVE_IGNORES_DEPTH) 
     15    ADD_DEFINITIONS(-DOSG_MULTISAMPLE_FBO_RESOLVE_IGNORES_DEPTH) 
     16ENDIF(OSG_MULTISAMPLE_FBO_RESOLVE_IGNORES_DEPTH) 
     17 
    818 
    919SET(LIB_NAME osgUtil)