Updated index.html with dependacy info about the new osgText library.
Modified osg/Drawable::draw(..) so that it uses display list COMPILE rather than COMPILE_AND_EXECUTE to solve performance problems under NVidia drivers. The old behavior is still available by comments out a #define. Fixed the default compilation list src/osgPlugins/Makefile so that it compiles by defalt png and gif.
This commit is contained in:
@@ -22,7 +22,13 @@ class Vec2;
|
||||
class Vec3;
|
||||
class Vec4;
|
||||
|
||||
// this is define to alter the way display lists are compiled inside the
|
||||
// the draw method, it has been found that the NVidia drivers fail completely
|
||||
// to optimize COMPILE_AND_EXECUTE in fact make it go slower than for no display
|
||||
// lists, but optimize a seperate COMPILE very well?! Define it as default
|
||||
// the use of a sperate COMPILE, then glCallList rather than use COMPILE_AND_EXECUTE.
|
||||
|
||||
#define USE_SEPERATE_COMPILE_AND_EXECUTE
|
||||
|
||||
/** Pure virtual base class for drawable Geometry. Contains no drawing primitives
|
||||
directly, these are provided by subclasses such as GeoSet. State attributes
|
||||
@@ -232,10 +238,19 @@ inline void Drawable::draw(State& state)
|
||||
}
|
||||
else if (_useDisplayList)
|
||||
{
|
||||
#ifdef USE_SEPERATE_COMPILE_AND_EXECUTE
|
||||
globj = glGenLists( 1 );
|
||||
glNewList( globj, GL_COMPILE );
|
||||
drawImmediateMode(state);
|
||||
glEndList();
|
||||
|
||||
glCallList( globj);
|
||||
#else
|
||||
globj = glGenLists( 1 );
|
||||
glNewList( globj, GL_COMPILE_AND_EXECUTE );
|
||||
drawImmediateMode(state);
|
||||
glEndList();
|
||||
#endif
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user