Updated version number for 2.7.1 release, and added OSG_FORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL Cmake option
that enables the occlusion query workaround for an OpenGL driver crash
This commit is contained in:
Robert Osfield
parent
7f042b803a
commit
908f49f6e3
@ -25,7 +25,7 @@ PROJECT(OpenSceneGraph)
|
||||
|
||||
SET(OPENSCENEGRAPH_MAJOR_VERSION 2)
|
||||
SET(OPENSCENEGRAPH_MINOR_VERSION 7)
|
||||
SET(OPENSCENEGRAPH_PATCH_VERSION 0)
|
||||
SET(OPENSCENEGRAPH_PATCH_VERSION 1)
|
||||
SET(OPENSCENEGRAPH_SOVERSION 45)
|
||||
|
||||
SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
|
||||
@ -270,6 +270,17 @@ IF(PKG_CONFIG_FOUND)
|
||||
|
||||
ENDIF(PKG_CONFIG_FOUND)
|
||||
|
||||
|
||||
#
|
||||
# Enable workaround for OpenGL driver crash with occlusion query
|
||||
#
|
||||
OPTION(OSG_FORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL "Set to ON to build OcclussionQueryNode with a workaround for multi-threaded OpenGL driver occlussion query crash. " OFF)
|
||||
IF(OSG_FORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL)
|
||||
ADD_DEFINITIONS(-DFORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL)
|
||||
ENDIF(OSG_FORCE_QUERY_RESULT_AVAILABLE_BEFORE_RETRIEVAL)
|
||||
|
||||
|
||||
|
||||
#
|
||||
# Test to determine if we want the "tripledot" form of the GLU tesselator callback.
|
||||
#
|
||||
@ -303,7 +314,7 @@ IF(NOT DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT)
|
||||
ENDIF(WIN32 OR CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||
ENDIF(NOT DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT)
|
||||
|
||||
OPTION(OSG_GLU_TESS_CALLBACK_TRIPLEDOT "Set to ON to build build with variable parameter (...) version of GLU tesselator callback" ${DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT})
|
||||
OPTION(OSG_GLU_TESS_CALLBACK_TRIPLEDOT "Set to ON to build with variable parameter (...) version of GLU tesselator callback" ${DEFAULT_GLU_TESS_CALLBACK_TRIPLEDOT})
|
||||
IF(OSG_GLU_TESS_CALLBACK_TRIPLEDOT)
|
||||
ADD_DEFINITIONS(-DGLU_TESS_CALLBACK_TRIPLEDOT)
|
||||
ENDIF(OSG_GLU_TESS_CALLBACK_TRIPLEDOT)
|
||||
|
||||
80
ChangeLog
80
ChangeLog
@ -1,3 +1,83 @@
|
||||
2008-08-25 15:20 +0000 [r8792] robert:
|
||||
|
||||
* From Michael Guerrero, Fixed crash that occurred when openning an
|
||||
new movie file after all previous movie ImageStream had been
|
||||
closed. Also add a missing close of the movie file.
|
||||
|
||||
2008-08-25 15:03 +0000 [r8791] robert:
|
||||
|
||||
* From Paul Martz, "This change fixes a problem with PAT nodes
|
||||
during FLT export." Note, Paul Martz has merged this patch into
|
||||
OpenSceneGraph-2.6.
|
||||
|
||||
2008-08-25 14:59 +0000 [r8790] robert:
|
||||
|
||||
* From Guillaume Chouvenc, "I have added the file
|
||||
StateAttribute.cpp in src/osgPlugins/osg to support the reading
|
||||
and writing of StateAttribute Callback in osg files. "
|
||||
|
||||
2008-08-25 14:54 +0000 [r8789] robert:
|
||||
|
||||
* From Guillaume Chouvenc, "I have modified Uniform.cpp and
|
||||
StateSet.cpp in src/osgPlugins/osg to support the reading and
|
||||
writing of Uniform Callback and StateSet Callback in osg files."
|
||||
|
||||
2008-08-25 11:37 +0000 [r8788] robert:
|
||||
|
||||
* Added testing of max texture size using a realize operation
|
||||
|
||||
2008-08-25 10:38 +0000 [r8786-8787] robert:
|
||||
|
||||
* Added support for event handler for non shader path, enable alpha
|
||||
func
|
||||
|
||||
* Removed debug info
|
||||
|
||||
2008-08-25 10:20 +0000 [r8785] robert:
|
||||
|
||||
* Moved _stateset = new StateSet instances to setStateSet(new
|
||||
StateSet) to make sure the wiring up of the StateSet parents is
|
||||
done consistently
|
||||
|
||||
2008-08-25 09:53 +0000 [r8784] robert:
|
||||
|
||||
* Added command line arguments to Viewer constructor, and added
|
||||
meaningful error message when no 3d image is provided
|
||||
|
||||
2008-08-22 16:39 +0000 [r8780-8782] robert:
|
||||
|
||||
* Introduced initial cut of a dicom loader, which uses ITK to do
|
||||
the loading.
|
||||
|
||||
* Added warning message
|
||||
|
||||
* Added support for reading the image transform from UserData in
|
||||
the form of a Matrix.
|
||||
|
||||
2008-08-19 17:41 +0000 [r8779] robert:
|
||||
|
||||
* Added checked against an empty _kdNodes list before commensing
|
||||
with intersection
|
||||
|
||||
2008-08-18 15:08 +0000 [r8776-8777] robert:
|
||||
|
||||
* Added --mip command line option which enables Maximum Intensity
|
||||
Projection filtering
|
||||
|
||||
* Added .ive support for BlendEquation
|
||||
|
||||
2008-08-18 14:49 +0000 [r8775] robert:
|
||||
|
||||
* Added BlendEquation .osg support
|
||||
|
||||
2008-08-18 12:39 +0000 [r8773] robert:
|
||||
|
||||
* Updated AUTHORS file for 2.7.0 release
|
||||
|
||||
2008-08-18 11:55 +0000 [r8772] robert:
|
||||
|
||||
* Updated ChangeLog for 2.7.0 release
|
||||
|
||||
2008-08-18 11:48 +0000 [r8771] robert:
|
||||
|
||||
* Updated wrappers
|
||||
|
||||
@ -21,7 +21,7 @@ extern "C" {
|
||||
|
||||
#define OPENSCENEGRAPH_MAJOR_VERSION 2
|
||||
#define OPENSCENEGRAPH_MINOR_VERSION 7
|
||||
#define OPENSCENEGRAPH_PATCH_VERSION 0
|
||||
#define OPENSCENEGRAPH_PATCH_VERSION 1
|
||||
#define OPENSCENEGRAPH_SOVERSION 45
|
||||
|
||||
/**
|
||||
|
||||
@ -7,7 +7,7 @@ includedir=${prefix}/include
|
||||
|
||||
Name: openscenegraph
|
||||
Description: 3D scenegraph
|
||||
Version: 2.7.0
|
||||
Version: 2.7.1
|
||||
Requires: openthreads
|
||||
Conflicts:
|
||||
Libs: -L${libdir} -losg -losgDB -losgFX -losgGA -losgParticle -losgSim -losgText -losgUtil -losgTerrain -losgManipulator -losgViewer -losgWidget
|
||||
|
||||
Loading…
Reference in New Issue
Block a user