Context Navigation

← Previous Changeset
Next Changeset →

Changeset 11208

Timestamp:

03/13/10 19:09:26 (3 years ago)

Author:

paulmartz

Message:

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

Location:

OpenSceneGraph/branches/OpenSceneGraph-2.8

Files:

: 45 modified

. (modified) (1 prop)
applications/osgarchive/osgarchive.cpp (modified) (1 prop)
examples (modified) (1 prop)
examples/osganimationtimeline (modified) (1 prop)
examples/osgcluster/broadcaster.cpp (modified) (1 prop)
include/osg (modified) (1 prop)
src/OpenThreads/pthreads (modified) (1 prop)
src/OpenThreads/win32 (modified) (1 prop)
src/osg (modified) (1 prop)
src/osg/Drawable.cpp (modified) (1 prop)
src/osg/Geometry.cpp (modified) (1 prop)
src/osg/GraphicsContext.cpp (modified) (1 prop)
src/osg/Image.cpp (modified) (1 prop)
src/osg/Node.cpp (modified) (1 prop)
src/osg/PolygonOffset.cpp (modified) (1 prop)
src/osg/State.cpp (modified) (1 prop)
src/osgDB (modified) (1 prop)
src/osgDB/CMakeLists.txt (modified) (1 prop)
src/osgDB/DatabasePager.cpp (modified) (1 prop)
src/osgManipulator (modified) (1 prop)
src/osgPlugins (modified) (1 prop)
src/osgPlugins/3ds/ReaderWriter3DS.cpp (modified) (1 prop)
src/osgPlugins/OpenFlight (modified) (1 prop)
src/osgPlugins/bsp (modified) (1 prop)
src/osgPlugins/bsp/VBSPReader.cpp (modified) (1 prop)
src/osgPlugins/curl (modified) (1 prop)
src/osgPlugins/dxf (modified) (1 prop)
src/osgPlugins/dxf/dxfEntity.cpp (modified) (1 prop)
src/osgPlugins/hdr/hdrloader.cpp (modified) (1 prop)
src/osgPlugins/jpeg (modified) (1 prop)
src/osgPlugins/mdl (modified) (1 prop)
src/osgPlugins/mdl/MDLReader.cpp (modified) (1 prop)
src/osgPlugins/osgVolume (modified) (1 prop)
src/osgPlugins/pdf (modified) (1 prop)
src/osgPlugins/txp (modified) (1 prop)
src/osgSim (modified) (1 prop)
src/osgTerrain (modified) (1 prop)
src/osgText/TextBase.cpp (modified) (1 prop)
src/osgUtil/CMakeLists.txt (modified) (1 diff)
src/osgUtil/Optimizer.cpp (modified) (1 prop)
src/osgUtil/RenderStage.cpp (modified) (1 diff, 1 prop)
src/osgViewer (modified) (1 prop)
src/osgViewer/GraphicsWindowWin32.cpp (modified) (1 prop)
src/osgVolume (modified) (1 prop)
src/osgWidget (modified) (1 prop)

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/applications/osgarchive/osgarchive.cpp

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/applications/osgarchive/osgarchive.cpp:10664
1	2	/OpenSceneGraph/trunk/applications/osgarchive/osgarchive.cpp:9810

OpenSceneGraph/branches/OpenSceneGraph-2.8/examples

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/examples:10664
1	2	/OpenSceneGraph/trunk/examples:10064

OpenSceneGraph/branches/OpenSceneGraph-2.8/examples/osganimationtimeline

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/examples/osganimationtimeline:10664
1	2	/OpenSceneGraph/trunk/examples/osganimationtimeline:10064,10487

OpenSceneGraph/branches/OpenSceneGraph-2.8/examples/osgcluster/broadcaster.cpp

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/examples/osgcluster/broadcaster.cpp:10664
1	2	/OpenSceneGraph/trunk/examples/osgcluster/broadcaster.cpp:9828,10064

OpenSceneGraph/branches/OpenSceneGraph-2.8/include/osg

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/include/osg:10664
1	2	/OpenSceneGraph/trunk/include/osg:10228,10410

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/OpenThreads/pthreads

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/OpenThreads/pthreads:10664
1	2	/OpenSceneGraph/trunk/src/OpenThreads/pthreads:10219

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/OpenThreads/win32

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/OpenThreads/win32:10664
1	2	/OpenSceneGraph/trunk/src/OpenThreads/win32:9832,10191,10457

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg:10664
1	2	/OpenSceneGraph/trunk:10327

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/Drawable.cpp

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg/Drawable.cpp:10664
1	2	/OpenSceneGraph/trunk/include/osg/src/osg/Drawable.cpp:9882
2	3	/OpenSceneGraph/trunk/src/osg/Drawable.cpp:9897

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/Geometry.cpp

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg/Geometry.cpp:10664
1	2	/OpenSceneGraph/trunk/include/osg/src/osg/Geometry.cpp:9882
2	3	/OpenSceneGraph/trunk/src/osg/Geometry.cpp:9900

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/GraphicsContext.cpp

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg/GraphicsContext.cpp:10664
1	2	/OpenSceneGraph/trunk/src/osg/GraphicsContext.cpp:10154

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/Image.cpp

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg/Image.cpp:10664
1	2	/OpenSceneGraph/trunk/src/osg/Image.cpp:10062

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/Node.cpp

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg/Node.cpp:10664
1	2	/OpenSceneGraph/trunk/include/osg/src/osg/Node.cpp:9882
2	3	/OpenSceneGraph/trunk/src/osg/Node.cpp:9897

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/PolygonOffset.cpp

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg/PolygonOffset.cpp:10664
1	2	/OpenSceneGraph/trunk/src/osg/PolygonOffset.cpp:10083-10084

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osg/State.cpp

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osg/State.cpp:10664
1	2	/OpenSceneGraph/trunk/src/osg/State.cpp:9798

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgDB

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgDB:10664
1	2	/OpenSceneGraph/trunk/src/osgDB:10150

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgDB/CMakeLists.txt

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgDB/CMakeLists.txt:10664
1	2	/OpenSceneGraph/trunk/include/osg/src/osgDB/CMakeLists.txt:9882
2	3	/OpenSceneGraph/trunk/src/osgDB/CMakeLists.txt:9922,10150

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgDB/DatabasePager.cpp

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgDB/DatabasePager.cpp:10664
1	2	/OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp:10054,10150

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgManipulator

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgManipulator:10664
1	2	/OpenSceneGraph/trunk/src/osgManipulator:10358

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins:10664
1	2	/OpenSceneGraph/trunk:10539

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/3ds/ReaderWriter3DS.cpp

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/3ds/ReaderWriter3DS.cpp:10664
1	2	/OpenSceneGraph/trunk/include/osg/src/osgPlugins/3ds/ReaderWriter3DS.cpp:9882
2	3	/OpenSceneGraph/trunk/src/osgPlugins/3ds/ReaderWriter3DS.cpp:9906

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/OpenFlight

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/OpenFlight:10664
1	2	/OpenSceneGraph/trunk/src/osgPlugins/OpenFlight:10084,10491

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/bsp

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/bsp:10664
1	2	/OpenSceneGraph/trunk/src/osgPlugins/bsp:10482-10484

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/bsp/VBSPReader.cpp

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/bsp/VBSPReader.cpp:10664
1	2	/OpenSceneGraph/trunk/src/osgPlugins/bsp/VBSPReader.cpp:10482-10484,10539

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/curl

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/curl:10664
1	2	/OpenSceneGraph/trunk/src/osgPlugins/curl:10222

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/dxf

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/dxf:10664
1	2	/OpenSceneGraph/trunk:9804

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/dxf/dxfEntity.cpp

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/dxf/dxfEntity.cpp:10664
1	2	/OpenSceneGraph/trunk/dxfEntity.cpp:9804
2	3	/OpenSceneGraph/trunk/src/osgPlugins/dxf/dxfEntity.cpp:9804

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/hdr/hdrloader.cpp

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/hdr/hdrloader.cpp:10664
1	2	/OpenSceneGraph/trunk/src/osgPlugins/hdr/hdrloader.cpp:9801

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/jpeg

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/jpeg:10664
1	2	/OpenSceneGraph/trunk/src/osgPlugins/jpeg:10496

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/mdl

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/mdl:10664
1	2	/OpenSceneGraph/trunk/src/osgPlugins/mdl:10093,10482-10483

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/mdl/MDLReader.cpp

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/mdl/MDLReader.cpp:10664
1	2	/OpenSceneGraph/trunk/src/osgPlugins/mdl/MDLReader.cpp:10093,10482-10483,10539

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/osgVolume

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/osgVolume:10664
1	2	/OpenSceneGraph/trunk/src/osgPlugins/osgVolume:10101-10137

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/pdf

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/pdf:10664
1	2	/OpenSceneGraph/trunk/src/osgPlugins/pdf:10144

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgPlugins/txp

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgPlugins/txp:10664
1	2	/OpenSceneGraph/trunk/src/osgPlugins/txp:10387

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgSim

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgSim:10664
1	2	/OpenSceneGraph/trunk/src/osgSim:10321

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgTerrain

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgTerrain:10664
1	2	/OpenSceneGraph/trunk/src/osgTerrain:10230

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgText/TextBase.cpp

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgText/TextBase.cpp:10664
1	2	/OpenSceneGraph/trunk/src/osgText/TextBase.cpp:10376

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgUtil/CMakeLists.txt

r8211	r11208
6	6	ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
7	7	ENDIF(DYNAMIC_OPENSCENEGRAPH)
	8
	9
	10	#
	11	# MSFBO resolve blit to depth buffer control.
	12	#
	13	OPTION(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)
	14	IF(OSG_MULTISAMPLE_FBO_RESOLVE_IGNORES_DEPTH)
	15	ADD_DEFINITIONS(-DOSG_MULTISAMPLE_FBO_RESOLVE_IGNORES_DEPTH)
	16	ENDIF(OSG_MULTISAMPLE_FBO_RESOLVE_IGNORES_DEPTH)
	17
8	18
9	19	SET(LIB_NAME osgUtil)

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgUtil/Optimizer.cpp

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgUtil/Optimizer.cpp:10664
1	2	/OpenSceneGraph/trunk/include/osg/src/osgUtil/Optimizer.cpp:9882
2	3	/OpenSceneGraph/trunk/src/osgUtil/Optimizer.cpp:9902,9920,9987,10480

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
1	2	/OpenSceneGraph/trunk/src/osgUtil/RenderStage.cpp:9822

r10277	r11208
880	880	{
881	881	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.
882	888	blitMask \|= GL_DEPTH_BUFFER_BIT;
	889	#endif
883	890	break;
884	891	case Camera::STENCIL_BUFFER:

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgViewer

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgViewer:10664
1	2	/OpenSceneGraph/trunk/src/osgViewer:10147,10364-10365,10460

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgViewer/GraphicsWindowWin32.cpp

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgViewer/GraphicsWindowWin32.cpp:10664
1	2	/OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowWin32.cpp:9824,10147,10364-10365,10460

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgVolume

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgVolume:10664
1	2	/OpenSceneGraph/trunk/src/osgVolume:10101-10137

OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgWidget

Property svn:mergeinfo

old	new
	1	/OpenSceneGraph/branches/OpenSceneGraph-2.8.2/src/osgWidget:10664
1	2	/OpenSceneGraph/trunk/src/osgWidget:10182,10489

Context Navigation

Changeset 11208

Legend:

Download in other formats: