Show
Ignore:
Timestamp:
03/13/10 19:09:26 (5 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/RenderStage.cpp

    • Property svn:mergeinfo
      •  

        old new  
         1/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgUtil/RenderStage.cpp:10664 
        12/OpenSceneGraph/trunk/src/osgUtil/RenderStage.cpp:9822 
    r10277 r11208  
    880880            { 
    881881            case Camera::DEPTH_BUFFER: 
     882#ifndef OSG_MULTISAMPLE_FBO_RESOLVE_IGNORES_DEPTH 
     883                // This #define is a workaround for an OS X NVIDIA driver bug 
     884                // confirmed on GeForce 8800 with driver v1.5.49. 
     885                // If the glBlitFramebuffer mask includes depth, the OS X desktop 
     886                // will hang. The #define is controlled from CMake and should be 
     887                // set to ON to enable the workaround and avoid blitting depth. 
    882888                blitMask |= GL_DEPTH_BUFFER_BIT; 
     889#endif 
    883890                break; 
    884891            case Camera::STENCIL_BUFFER: