FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert NOTIFY to OSG_NOTIFY to avoid problems with polution of users apps with the NOTIFY macro

Browse Source
This commit is contained in:
Robert Osfield
2010-02-10 12:44:59 +00:00
parent 6ab51c7c47
commit f17e401347
42 changed files with 884 additions and 884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
src/osg/BufferObject.cpp
View File

@@ -66,12 +66,12 @@ GLBufferObject::GLBufferObject(unsigned int contextID, BufferObject* bufferObjec
_extensions->glGenBuffers(1, &_glObjectID);
}
// NOTIFY(osg::NOTICE)<<"Constucting BufferObject "<<this<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"Constucting BufferObject "<<this<<std::endl;
}
GLBufferObject::~GLBufferObject()
{
//NOTIFY(osg::NOTICE)<<"Destucting BufferObject "<<this<<std::endl;
//OSG_NOTIFY(osg::NOTICE)<<"Destucting BufferObject "<<this<<std::endl;
}
void GLBufferObject::setBufferObject(BufferObject* bufferObject)
@@ -129,7 +129,7 @@ void GLBufferObject::compileBuffer()
{
unsigned int previousEndOfBufferDataMarker = entry.offset + entry.dataSize;
// NOTIFY(osg::NOTICE)<<"GLBufferObject::compileBuffer(..) updating BufferEntry"<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"GLBufferObject::compileBuffer(..) updating BufferEntry"<<std::endl;
entry.offset = newTotalSize;
@@ -152,11 +152,11 @@ void GLBufferObject::compileBuffer()
entry.dataSize = bd->getTotalDataSize();
entry.dataSource = bd;
#if 0
NOTIFY(osg::NOTICE)<<"entry"<<std::endl;
NOTIFY(osg::NOTICE)<<" offset "<<entry.offset<<std::endl;
NOTIFY(osg::NOTICE)<<" dataSize "<<entry.dataSize<<std::endl;
NOTIFY(osg::NOTICE)<<" dataSource "<<entry.dataSource<<std::endl;
NOTIFY(osg::NOTICE)<<" modifiedCount "<<entry.modifiedCount<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"entry"<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" offset "<<entry.offset<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" dataSize "<<entry.dataSize<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" dataSource "<<entry.dataSource<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" modifiedCount "<<entry.modifiedCount<<std::endl;
#endif
newTotalSize += entry.dataSize;
@@ -175,7 +175,7 @@ void GLBufferObject::compileBuffer()
if (newTotalSize > _profile._size)
{
NOTIFY(osg::INFO)<<"newTotalSize="<<newTotalSize<<", _profile._size="<<_profile._size<<std::endl;
OSG_NOTIFY(osg::INFO)<<"newTotalSize="<<newTotalSize<<", _profile._size="<<_profile._size<<std::endl;
_profile._size = newTotalSize;
@@ -205,7 +205,7 @@ void GLBufferObject::compileBuffer()
BufferEntry& entry = *itr;
if (compileAll || entry.modifiedCount != entry.dataSource->getModifiedCount())
{
// NOTIFY(osg::NOTICE)<<"GLBufferObject::compileBuffer(..) downloading BufferEntry "<<&entry<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"GLBufferObject::compileBuffer(..) downloading BufferEntry "<<&entry<<std::endl;
entry.modifiedCount = entry.dataSource->getModifiedCount();
if (vboMemory)
@@ -224,7 +224,7 @@ void GLBufferObject::compileBuffer()
void GLBufferObject::deleteGLObject()
{
NOTIFY(osg::INFO)<<"GLBufferObject::deleteGLObject() "<<_glObjectID<<std::endl;
OSG_NOTIFY(osg::INFO)<<"GLBufferObject::deleteGLObject() "<<_glObjectID<<std::endl;
if (_glObjectID!=0)
{
_extensions->glDeleteBuffers(1, &_glObjectID);
@@ -397,16 +397,16 @@ GLBufferObjectSet::GLBufferObjectSet(GLBufferObjectManager* parent, const Buffer
_head(0),
_tail(0)
{
NOTIFY(osg::INFO)<<"GLBufferObjectSet::GLBufferObjectSet _profile._size="<<_profile._size<<std::endl;
OSG_NOTIFY(osg::INFO)<<"GLBufferObjectSet::GLBufferObjectSet _profile._size="<<_profile._size<<std::endl;
}
GLBufferObjectSet::~GLBufferObjectSet()
{
#if 0
NOTIFY(osg::NOTICE)<<"GLBufferObjectSet::~GLBufferObjectSet(), _numOfGLBufferObjects="<<_numOfGLBufferObjects<<std::endl;
NOTIFY(osg::NOTICE)<<" _orphanedGLBufferObjects = "<<_orphanedGLBufferObjects.size()<<std::endl;
NOTIFY(osg::NOTICE)<<" _head = "<<_head<<std::endl;
NOTIFY(osg::NOTICE)<<" _tail = "<<_tail<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"GLBufferObjectSet::~GLBufferObjectSet(), _numOfGLBufferObjects="<<_numOfGLBufferObjects<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" _orphanedGLBufferObjects = "<<_orphanedGLBufferObjects.size()<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" _head = "<<_head<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" _tail = "<<_tail<<std::endl;
#endif
}
@@ -415,7 +415,7 @@ bool GLBufferObjectSet::checkConsistency() const
#ifndef CHECK_CONSISTENCY
return true;
#else
// NOTIFY(osg::NOTICE)<<"GLBufferObjectSet::checkConsistency()"<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"GLBufferObjectSet::checkConsistency()"<<std::endl;
// check consistency of linked list.
unsigned int numInList = 0;
GLBufferObject* to = _head;
@@ -427,7 +427,7 @@ bool GLBufferObjectSet::checkConsistency() const
{
if ((to->_next)->_previous != to)
{
NOTIFY(osg::NOTICE)<<"GLBufferObjectSet::checkConsistency() : Error (to->_next)->_previous != to "<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"GLBufferObjectSet::checkConsistency() : Error (to->_next)->_previous != to "<<std::endl;
return false;
}
}
@@ -435,7 +435,7 @@ bool GLBufferObjectSet::checkConsistency() const
{
if (_tail != to)
{
NOTIFY(osg::NOTICE)<<"GLBufferObjectSet::checkConsistency() : Error _trail != to"<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"GLBufferObjectSet::checkConsistency() : Error _trail != to"<<std::endl;
return false;
}
}
@@ -446,11 +446,11 @@ bool GLBufferObjectSet::checkConsistency() const
unsigned int totalNumber = numInList + _orphanedGLBufferObjects.size();
if (totalNumber != _numOfGLBufferObjects)
{
NOTIFY(osg::NOTICE)<<"Error numInList + _orphanedGLBufferObjects.size() != _numOfGLBufferObjects"<<std::endl;
NOTIFY(osg::NOTICE)<<" numInList = "<<numInList<<std::endl;
NOTIFY(osg::NOTICE)<<" _orphanedGLBufferObjects.size() = "<<_orphanedGLBufferObjects.size()<<std::endl;
NOTIFY(osg::NOTICE)<<" _pendingOrphanedGLBufferObjects.size() = "<<_pendingOrphanedGLBufferObjects.size()<<std::endl;
NOTIFY(osg::NOTICE)<<" _numOfGLBufferObjects = "<<_numOfGLBufferObjects<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"Error numInList + _orphanedGLBufferObjects.size() != _numOfGLBufferObjects"<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" numInList = "<<numInList<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" _orphanedGLBufferObjects.size() = "<<_orphanedGLBufferObjects.size()<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" _pendingOrphanedGLBufferObjects.size() = "<<_pendingOrphanedGLBufferObjects.size()<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" _numOfGLBufferObjects = "<<_numOfGLBufferObjects<<std::endl;
return false;
}
@@ -460,7 +460,7 @@ bool GLBufferObjectSet::checkConsistency() const
void GLBufferObjectSet::handlePendingOrphandedGLBufferObjects()
{
// NOTIFY(osg::NOTICE)<<"handlePendingOrphandedGLBufferObjects()"<<_pendingOrphanedGLBufferObjects.size()<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"handlePendingOrphandedGLBufferObjects()"<<_pendingOrphanedGLBufferObjects.size()<<std::endl;
if (_pendingOrphanedGLBufferObjects.empty()) return;
@@ -477,10 +477,10 @@ void GLBufferObjectSet::handlePendingOrphandedGLBufferObjects()
remove(to);
#if 0
NOTIFY(osg::NOTICE)<<" HPOTO after _head = "<<_head<<std::endl;
NOTIFY(osg::NOTICE)<<" HPOTO after _tail = "<<_tail<<std::endl;
NOTIFY(osg::NOTICE)<<" HPOTO after to->_previous = "<<to->_previous<<std::endl;
NOTIFY(osg::NOTICE)<<" HPOTO after to->_next = "<<to->_next<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" HPOTO after _head = "<<_head<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" HPOTO after _tail = "<<_tail<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" HPOTO after to->_previous = "<<to->_previous<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" HPOTO after to->_next = "<<to->_next<<std::endl;
#endif
}
@@ -497,7 +497,7 @@ void GLBufferObjectSet::handlePendingOrphandedGLBufferObjects()
void GLBufferObjectSet::deleteAllGLBufferObjects()
{
// NOTIFY(osg::NOTICE)<<"GLBufferObjectSet::deleteAllGLBufferObjects()"<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"GLBufferObjectSet::deleteAllGLBufferObjects()"<<std::endl;
// clean up the pending orphans.
handlePendingOrphandedGLBufferObjects();
@@ -529,12 +529,12 @@ void GLBufferObjectSet::deleteAllGLBufferObjects()
// do the actual delete.
flushAllDeletedGLBufferObjects();
// NOTIFY(osg::NOTICE)<<"done GLBufferObjectSet::deleteAllGLBufferObjects()"<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"done GLBufferObjectSet::deleteAllGLBufferObjects()"<<std::endl;
}
void GLBufferObjectSet::discardAllGLBufferObjects()
{
// NOTIFY(osg::NOTICE)<<"GLBufferObjectSet::discardAllGLBufferObjects()"<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"GLBufferObjectSet::discardAllGLBufferObjects()"<<std::endl;
GLBufferObject* to = _head;
while(to!=0)
@@ -589,7 +589,7 @@ void GLBufferObjectSet::flushAllDeletedGLBufferObjects()
void GLBufferObjectSet::discardAllDeletedGLBufferObjects()
{
// NOTIFY(osg::NOTICE)<<"GLBufferObjectSet::discardAllDeletedGLBufferObjects()"<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"GLBufferObjectSet::discardAllDeletedGLBufferObjects()"<<std::endl;
// clean up the pending orphans.
handlePendingOrphandedGLBufferObjects();
@@ -639,9 +639,9 @@ void GLBufferObjectSet::flushDeletedGLBufferObjects(double currentTime, double&
++numDeleted;
}
// NOTIFY(osg::NOTICE)<<"Size before = "<<_orphanedGLBufferObjects.size();
// OSG_NOTIFY(osg::NOTICE)<<"Size before = "<<_orphanedGLBufferObjects.size();
_orphanedGLBufferObjects.erase(_orphanedGLBufferObjects.begin(), itr);
//NOTIFY(osg::NOTICE)<<", after = "<<_orphanedGLBufferObjects.size()<<" numDeleted = "<<numDeleted<<std::endl;
//OSG_NOTIFY(osg::NOTICE)<<", after = "<<_orphanedGLBufferObjects.size()<<" numDeleted = "<<numDeleted<<std::endl;
// update the number of TO's in this GLBufferObjectSet
_numOfGLBufferObjects -= numDeleted;
@@ -689,7 +689,7 @@ GLBufferObject* GLBufferObjectSet::takeFromOrphans(BufferObject* bufferObject)
// place at back of active list
addToBack(glbo.get());
// NOTIFY(osg::NOTICE)<<"Reusing orhpahned GLBufferObject, _numOfGLBufferObjects="<<_numOfGLBufferObjects<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"Reusing orhpahned GLBufferObject, _numOfGLBufferObjects="<<_numOfGLBufferObjects<<std::endl;
return glbo.release();
}
@@ -728,11 +728,11 @@ GLBufferObject* GLBufferObjectSet::takeOrGenerate(BufferObject* bufferObject)
if (original_BufferObject.valid())
{
original_BufferObject->setGLBufferObject(_contextID,0);
// NOTIFY(osg::NOTICE)<<"GLBufferObjectSet="<<this<<": Reusing an active GLBufferObject "<<glbo.get()<<" _numOfGLBufferObjects="<<_numOfGLBufferObjects<<" size="<<_profile._size<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"GLBufferObjectSet="<<this<<": Reusing an active GLBufferObject "<<glbo.get()<<" _numOfGLBufferObjects="<<_numOfGLBufferObjects<<" size="<<_profile._size<<std::endl;
}
else
{
// NOTIFY(osg::NOTICE)<<"Reusing a recently orphaned active GLBufferObject "<<glbo.get()<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"Reusing a recently orphaned active GLBufferObject "<<glbo.get()<<std::endl;
}
moveToBack(glbo.get());
@@ -756,7 +756,7 @@ GLBufferObject* GLBufferObjectSet::takeOrGenerate(BufferObject* bufferObject)
addToBack(glbo);
// NOTIFY(osg::NOTICE)<<"Created new GLBufferObject, _numOfGLBufferObjects "<<_numOfGLBufferObjects<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"Created new GLBufferObject, _numOfGLBufferObjects "<<_numOfGLBufferObjects<<std::endl;
return glbo;
}
@@ -764,11 +764,11 @@ GLBufferObject* GLBufferObjectSet::takeOrGenerate(BufferObject* bufferObject)
void GLBufferObjectSet::moveToBack(GLBufferObject* to)
{
#if 0
NOTIFY(osg::NOTICE)<<"GLBufferObjectSet::moveToBack("<<to<<")"<<std::endl;
NOTIFY(osg::NOTICE)<<" before _head = "<<_head<<std::endl;
NOTIFY(osg::NOTICE)<<" before _tail = "<<_tail<<std::endl;
NOTIFY(osg::NOTICE)<<" before to->_previous = "<<to->_previous<<std::endl;
NOTIFY(osg::NOTICE)<<" before to->_next = "<<to->_next<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"GLBufferObjectSet::moveToBack("<<to<<")"<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" before _head = "<<_head<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" before _tail = "<<_tail<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" before to->_previous = "<<to->_previous<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" before to->_next = "<<to->_next<<std::endl;
#endif
to->_frameLastUsed = _parent->getFrameNumber();
@@ -779,7 +779,7 @@ void GLBufferObjectSet::moveToBack(GLBufferObject* to)
// if no tail exists then assign 'to' as tail and head
if (_tail==0)
{
NOTIFY(osg::NOTICE)<<"Error ***************** Should not get here !!!!!!!!!"<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"Error ***************** Should not get here !!!!!!!!!"<<std::endl;
_head = to;
_tail = to;
return;
@@ -787,7 +787,7 @@ void GLBufferObjectSet::moveToBack(GLBufferObject* to)
if (to->_next==0)
{
NOTIFY(osg::NOTICE)<<"Error ***************** Should not get here either !!!!!!!!!"<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"Error ***************** Should not get here either !!!!!!!!!"<<std::endl;
return;
}
@@ -815,10 +815,10 @@ void GLBufferObjectSet::moveToBack(GLBufferObject* to)
_tail = to;
#if 0
NOTIFY(osg::NOTICE)<<" m2B after _head = "<<_head<<std::endl;
NOTIFY(osg::NOTICE)<<" m2B after _tail = "<<_tail<<std::endl;
NOTIFY(osg::NOTICE)<<" m2B after to->_previous = "<<to->_previous<<std::endl;
NOTIFY(osg::NOTICE)<<" m2B after to->_next = "<<to->_next<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" m2B after _head = "<<_head<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" m2B after _tail = "<<_tail<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" m2B after to->_previous = "<<to->_previous<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" m2B after to->_next = "<<to->_next<<std::endl;
#endif
checkConsistency();
}
@@ -826,11 +826,11 @@ void GLBufferObjectSet::moveToBack(GLBufferObject* to)
void GLBufferObjectSet::addToBack(GLBufferObject* to)
{
#if 0
NOTIFY(osg::NOTICE)<<"GLBufferObjectSet::addToBack("<<to<<")"<<std::endl;
NOTIFY(osg::NOTICE)<<" before _head = "<<_head<<std::endl;
NOTIFY(osg::NOTICE)<<" before _tail = "<<_tail<<std::endl;
NOTIFY(osg::NOTICE)<<" before to->_previous = "<<to->_previous<<std::endl;
NOTIFY(osg::NOTICE)<<" before to->_next = "<<to->_next<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"GLBufferObjectSet::addToBack("<<to<<")"<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" before _head = "<<_head<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" before _tail = "<<_tail<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" before to->_previous = "<<to->_previous<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" before to->_next = "<<to->_next<<std::endl;
#endif
if (to->_previous !=0 || to->_next !=0)
@@ -848,10 +848,10 @@ void GLBufferObjectSet::addToBack(GLBufferObject* to)
_tail = to;
}
#if 0
NOTIFY(osg::NOTICE)<<" a2B after _head = "<<_head<<std::endl;
NOTIFY(osg::NOTICE)<<" a2B after _tail = "<<_tail<<std::endl;
NOTIFY(osg::NOTICE)<<" a2B after to->_previous = "<<to->_previous<<std::endl;
NOTIFY(osg::NOTICE)<<" a2B after to->_next = "<<to->_next<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" a2B after _head = "<<_head<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" a2B after _tail = "<<_tail<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" a2B after to->_previous = "<<to->_previous<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" a2B after to->_next = "<<to->_next<<std::endl;
#endif
checkConsistency();
}
@@ -939,7 +939,7 @@ void GLBufferObjectManager::setMaxGLBufferObjectPoolSize(unsigned int size)
if (size<_currGLBufferObjectPoolSize)
{
NOTIFY(osg::NOTICE)<<"Warning: new MaxGLBufferObjectPoolSize="<<size<<" is smaller than current GLBufferObjectPoolSize="<<_currGLBufferObjectPoolSize<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"Warning: new MaxGLBufferObjectPoolSize="<<size<<" is smaller than current GLBufferObjectPoolSize="<<_currGLBufferObjectPoolSize<<std::endl;
}
_maxGLBufferObjectPoolSize = size;
@@ -965,7 +965,7 @@ GLBufferObject* GLBufferObjectManager::generateGLBufferObject(const BufferObject
BufferObjectProfile profile(bufferObject->getTarget(), bufferObject->getUsage(), bufferObject->computeRequiredBufferSize());
// NOTIFY(osg::NOTICE)<<"GLBufferObjectManager::generateGLBufferObject size="<<bufferObject->computeRequiredBufferSize()<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"GLBufferObjectManager::generateGLBufferObject size="<<bufferObject->computeRequiredBufferSize()<<std::endl;
GLBufferObjectSet* glbos = getGLBufferObjectSet(profile);
return glbos->takeOrGenerate(const_cast<BufferObject*>(bufferObject));
@@ -1049,7 +1049,7 @@ void GLBufferObjectManager::releaseGLBufferObject(GLBufferObject* to)
if (to->_set) to->_set->orphan(to);
else
{
NOTIFY(osg::NOTICE)<<"GLBufferObjectManager::releaseGLBufferObject(GLBufferObject* to) Not implemented yet"<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"GLBufferObjectManager::releaseGLBufferObject(GLBufferObject* to) Not implemented yet"<<std::endl;
}
}
@@ -1065,11 +1065,11 @@ void GLBufferObjectManager::newFrame(osg::FrameStamp* fs)
void GLBufferObjectManager::reportStats()
{
double numFrames(_numFrames==0 ? 1.0 : _numFrames);
NOTIFY(osg::NOTICE)<<"GLBufferObjectMananger::reportStats()"<<std::endl;
NOTIFY(osg::NOTICE)<<" total _numOfGLBufferObjects="<<_numActiveGLBufferObjects<<", _numOrphanedGLBufferObjects="<<_numOrphanedGLBufferObjects<<" _currGLBufferObjectPoolSize="<<_currGLBufferObjectPoolSize<<std::endl;
NOTIFY(osg::NOTICE)<<" total _numGenerated="<<_numGenerated<<", _generateTime="<<_generateTime<<", averagePerFrame="<<_generateTime/numFrames*1000.0<<"ms"<<std::endl;
NOTIFY(osg::NOTICE)<<" total _numDeleted="<<_numDeleted<<", _deleteTime="<<_deleteTime<<", averagePerFrame="<<_deleteTime/numFrames*1000.0<<"ms"<<std::endl;
NOTIFY(osg::NOTICE)<<" total _numApplied="<<_numApplied<<", _applyTime="<<_applyTime<<", averagePerFrame="<<_applyTime/numFrames*1000.0<<"ms"<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"GLBufferObjectMananger::reportStats()"<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" total _numOfGLBufferObjects="<<_numActiveGLBufferObjects<<", _numOrphanedGLBufferObjects="<<_numOrphanedGLBufferObjects<<" _currGLBufferObjectPoolSize="<<_currGLBufferObjectPoolSize<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" total _numGenerated="<<_numGenerated<<", _generateTime="<<_generateTime<<", averagePerFrame="<<_generateTime/numFrames*1000.0<<"ms"<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" total _numDeleted="<<_numDeleted<<", _deleteTime="<<_deleteTime<<", averagePerFrame="<<_deleteTime/numFrames*1000.0<<"ms"<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" total _numApplied="<<_numApplied<<", _applyTime="<<_applyTime<<", averagePerFrame="<<_applyTime/numFrames*1000.0<<"ms"<<std::endl;
}
void GLBufferObjectManager::resetStats()
@@ -1172,7 +1172,7 @@ void BufferObject::resizeGLObjectBuffers(unsigned int maxSize)
void BufferObject::releaseGLObjects(State* state) const
{
// NOTIFY(osg::NOTICE)<<"BufferObject::releaseGLObjects("<<state<<")"<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"BufferObject::releaseGLObjects("<<state<<")"<<std::endl;
if (state)
{
unsigned int contextID = state->getContextID();
@@ -1188,7 +1188,7 @@ void BufferObject::releaseGLObjects(State* state) const
{
if (_glBufferObjects[i].valid())
{
// NOTIFY(osg::NOTICE)<<" GLBufferObject::releaseGLBufferObject("<<i<<", _glBufferObjects["<<i<<"]="<<_glBufferObjects[i].get()<<")"<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<" GLBufferObject::releaseGLBufferObject("<<i<<", _glBufferObjects["<<i<<"]="<<_glBufferObjects[i].get()<<")"<<std::endl;
GLBufferObject::releaseGLBufferObject(i, _glBufferObjects[i].get());
_glBufferObjects[i] = 0;
}
@@ -1212,7 +1212,7 @@ unsigned int BufferObject::addBufferData(BufferData* bd)
_bufferDataList.push_back(bd);
// NOTIFY(osg::NOTICE)<<"BufferObject "<<this<<":"<<className()<<"::addBufferData("<<bd<<"), bufferIndex= "<<_bufferDataList.size()-1<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"BufferObject "<<this<<":"<<className()<<"::addBufferData("<<bd<<"), bufferIndex= "<<_bufferDataList.size()-1<<std::endl;
return _bufferDataList.size()-1;
}
@@ -1221,11 +1221,11 @@ void BufferObject::removeBufferData(unsigned int index)
{
if (index>=_bufferDataList.size())
{
NOTIFY(osg::WARN)<<"Error "<<className()<<"::removeBufferData("<<index<<") out of range."<<std::endl;
OSG_NOTIFY(osg::WARN)<<"Error "<<className()<<"::removeBufferData("<<index<<") out of range."<<std::endl;
return;
}
// NOTIFY(osg::NOTICE)<<"BufferObject::"<<this<<":"<<className()<<"::removeBufferData("<<index<<"), size= "<<_bufferDataList.size()<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"BufferObject::"<<this<<":"<<className()<<"::removeBufferData("<<index<<"), size= "<<_bufferDataList.size()<<std::endl;
// alter the indices of the BufferData after the entry to be removed so their indices are correctly placed.
for(unsigned int i=index+1; i<_bufferDataList.size(); ++i)
@@ -1245,7 +1245,7 @@ void BufferObject::removeBufferData(unsigned int index)
void BufferObject::removeBufferData(BufferData* bd)
{
// NOTIFY(osg::NOTICE)<<"BufferObject::"<<this<<":"<<className()<<"::removeBufferData("<<bd<<"), index="<<bd->getBufferIndex()<<" size= "<<_bufferDataList.size()<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"BufferObject::"<<this<<":"<<className()<<"::removeBufferData("<<bd<<"), index="<<bd->getBufferIndex()<<" size= "<<_bufferDataList.size()<<std::endl;
if (!bd || bd->getBufferObject()!=this) return;
@@ -1273,7 +1273,7 @@ void BufferObject::deleteBufferObject(unsigned int contextID,GLuint globj)
osg::ref_ptr<GLBufferObjectManager>& bufferObjectManager = GLBufferObjectManager::getGLBufferObjectManager(contextID);
if (!bufferObjectManager)
{
NOTIFY(osg::NOTICE)<<"Warning::BufferObject::deleteBufferObject("<<contextID<<", "<<globj<<") unable to get GLBufferObjectManager for context."<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"Warning::BufferObject::deleteBufferObject("<<contextID<<", "<<globj<<") unable to get GLBufferObjectManager for context."<<std::endl;
return;
}
osg::ref_ptr<GLBufferObject> glBufferObject = new GLBufferObject(contextID, 0, globj);
@@ -1281,7 +1281,7 @@ void BufferObject::deleteBufferObject(unsigned int contextID,GLuint globj)
GLBufferObjectSet* bufferObjectSet = bufferObjectManager->getGLBufferObjectSet(glBufferObject->getProfile());
if (!bufferObjectSet)
{
NOTIFY(osg::NOTICE)<<"Warning::BufferObject::deleteBufferObject("<<contextID<<", "<<globj<<") unable to get GLBufferObjectSet for context."<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"Warning::BufferObject::deleteBufferObject("<<contextID<<", "<<globj<<") unable to get GLBufferObjectSet for context."<<std::endl;
return;
}
@@ -1412,7 +1412,7 @@ PixelBufferObject::PixelBufferObject(osg::Image* image):
setTarget(GL_PIXEL_UNPACK_BUFFER_ARB);
setUsage(GL_STREAM_DRAW_ARB);
NOTIFY(osg::INFO)<<"Constructing PixelBufferObject for image="<<image<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Constructing PixelBufferObject for image="<<image<<std::endl;
setBufferData(0, image);
}

6
src/osg/Camera.cpp
View File

@@ -88,7 +88,7 @@ void Camera::DrawCallback::operator () (osg::RenderInfo& renderInfo) const
}
else
{
NOTIFY(osg::WARN)<<"Error: Camera::DrawCallback called without valid camera."<<std::endl;
OSG_NOTIFY(osg::WARN)<<"Error: Camera::DrawCallback called without valid camera."<<std::endl;
}
}
@@ -126,7 +126,7 @@ void Camera::setRenderTargetImplementation(RenderTargetImplementation impl, Rend
}
else
{
NOTIFY(osg::NOTICE)<<"Warning: Camera::setRenderTargetImplementation(impl,fallback) must have a lower rated fallback than the main target implementation."<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"Warning: Camera::setRenderTargetImplementation(impl,fallback) must have a lower rated fallback than the main target implementation."<<std::endl;
setRenderTargetImplementation(impl);
}
}
@@ -393,7 +393,7 @@ void Camera::inheritCullSettings(const CullSettings& settings, unsigned int inhe
const Camera* camera = dynamic_cast<const Camera*>(&settings);
if (camera)
{
//NOTIFY(osg::NOTICE)<<"Inheriting slave Camera"<<std::endl;
//OSG_NOTIFY(osg::NOTICE)<<"Inheriting slave Camera"<<std::endl;
if (inheritanceMask & CLEAR_COLOR)
_clearColor = camera->_clearColor;

10
src/osg/CullSettings.cpp
View File

@@ -95,7 +95,7 @@ static ApplicationUsageProxy ApplicationUsageProxyCullSettings_e1(ApplicationUsa
void CullSettings::readEnvironmentalVariables()
{
NOTIFY(osg::INFO)<<"CullSettings::readEnvironmentalVariables()"<<std::endl;
OSG_NOTIFY(osg::INFO)<<"CullSettings::readEnvironmentalVariables()"<<std::endl;
char *ptr;
@@ -105,7 +105,7 @@ void CullSettings::readEnvironmentalVariables()
else if (strcmp(ptr,"COMPUTE_NEAR_FAR_USING_BOUNDING_VOLUMES")==0) _computeNearFar = COMPUTE_NEAR_FAR_USING_BOUNDING_VOLUMES;
else if (strcmp(ptr,"COMPUTE_NEAR_FAR_USING_PRIMITIVES")==0) _computeNearFar = COMPUTE_NEAR_FAR_USING_PRIMITIVES;
NOTIFY(osg::INFO)<<"Set compute near far mode to "<<_computeNearFar<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Set compute near far mode to "<<_computeNearFar<<std::endl;
}
@@ -113,7 +113,7 @@ void CullSettings::readEnvironmentalVariables()
{
_nearFarRatio = osg::asciiToDouble(ptr);
NOTIFY(osg::INFO)<<"Set near/far ratio to "<<_nearFarRatio<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Set near/far ratio to "<<_nearFarRatio<<std::endl;
}
}
@@ -134,7 +134,7 @@ void CullSettings::readCommandLine(ArgumentParser& arguments)
else if (str=="COMPUTE_NEAR_FAR_USING_BOUNDING_VOLUMES") _computeNearFar = COMPUTE_NEAR_FAR_USING_BOUNDING_VOLUMES;
else if (str=="COMPUTE_NEAR_FAR_USING_PRIMITIVES") _computeNearFar = COMPUTE_NEAR_FAR_USING_PRIMITIVES;
NOTIFY(osg::INFO)<<"Set compute near far mode to "<<_computeNearFar<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Set compute near far mode to "<<_computeNearFar<<std::endl;
}
double value;
@@ -142,7 +142,7 @@ void CullSettings::readCommandLine(ArgumentParser& arguments)
{
_nearFarRatio = value;
NOTIFY(osg::INFO)<<"Set near/far ratio to "<<_nearFarRatio<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Set near/far ratio to "<<_nearFarRatio<<std::endl;
}
}

6
src/osg/GL2Extensions.cpp
View File

@@ -322,7 +322,7 @@ void GL2Extensions::setupGL2Extensions(unsigned int contextID)
const char* version = (const char*) glGetString( GL_VERSION );
if (!version)
{
NOTIFY(osg::FATAL)<<"Error: OpenGL version test failed, requires valid graphics context."<<std::endl;
OSG_NOTIFY(osg::FATAL)<<"Error: OpenGL version test failed, requires valid graphics context."<<std::endl;
return;
}
@@ -349,7 +349,7 @@ void GL2Extensions::setupGL2Extensions(unsigned int contextID)
_glslLanguageVersion = 1.0f;
}
NOTIFY(osg::INFO)
OSG_NOTIFY(osg::INFO)
<< "glVersion=" << getGlVersion() << ", "
<< "isGlslSupported=" << (isGlslSupported() ? "YES" : "NO") << ", "
<< "glslLanguageVersion=" << getLanguageVersion()
@@ -519,7 +519,7 @@ void GL2Extensions::Set(unsigned int contextID, GL2Extensions* extensions)
static void NotSupported( const char* funcName )
{
NOTIFY(osg::WARN)
OSG_NOTIFY(osg::WARN)
<<"Error: "<<funcName<<" not supported by OpenGL driver"<<std::endl;
}

20
src/osg/GLExtensions.cpp
View File

@@ -142,12 +142,12 @@ bool osg::isGLExtensionOrVersionSupported(unsigned int contextID, const char *ex
#endif
NOTIFY(INFO)<<"OpenGL extensions supported by installed OpenGL drivers are:"<<std::endl;
OSG_NOTIFY(INFO)<<"OpenGL extensions supported by installed OpenGL drivers are:"<<std::endl;
for(ExtensionSet::iterator itr=extensionSet.begin();
itr!=extensionSet.end();
++itr)
{
NOTIFY(INFO)<<" "<<*itr<<std::endl;
OSG_NOTIFY(INFO)<<" "<<*itr<<std::endl;
}
}
@@ -216,16 +216,16 @@ bool osg::isGLExtensionOrVersionSupported(unsigned int contextID, const char *ex
{
if (!extensionDisabled)
{
NOTIFY(INFO)<<"OpenGL extension '"<<extension<<"' is supported."<<std::endl;
OSG_NOTIFY(INFO)<<"OpenGL extension '"<<extension<<"' is supported."<<std::endl;
}
else
{
NOTIFY(INFO)<<"OpenGL extension '"<<extension<<"' is supported by OpenGL\ndriver but has been disabled by osg::getGLExtensionDisableString()."<<std::endl;
OSG_NOTIFY(INFO)<<"OpenGL extension '"<<extension<<"' is supported by OpenGL\ndriver but has been disabled by osg::getGLExtensionDisableString()."<<std::endl;
}
}
else
{
NOTIFY(INFO)<<"OpenGL extension '"<<extension<<"' is not supported."<<std::endl;
OSG_NOTIFY(INFO)<<"OpenGL extension '"<<extension<<"' is not supported."<<std::endl;
}
@@ -274,12 +274,12 @@ std::string& osg::getGLExtensionDisableString()
}
if (*startOfWord!=0) extensionSet.insert(std::string(startOfWord));
NOTIFY(INFO)<<"OpenGL extensions supported by installed OpenGL drivers are:"<<std::endl;
OSG_NOTIFY(INFO)<<"OpenGL extensions supported by installed OpenGL drivers are:"<<std::endl;
for(ExtensionSet::iterator itr=extensionSet.begin();
itr!=extensionSet.end();
++itr)
{
NOTIFY(INFO)<<" "<<*itr<<std::endl;
OSG_NOTIFY(INFO)<<" "<<*itr<<std::endl;
}
}
@@ -289,11 +289,11 @@ std::string& osg::getGLExtensionDisableString()
if (result)
{
NOTIFY(INFO)<<"OpenGL utility library extension '"<<extension<<"' is supported."<<std::endl;
OSG_NOTIFY(INFO)<<"OpenGL utility library extension '"<<extension<<"' is supported."<<std::endl;
}
else
{
NOTIFY(INFO)<<"OpenGL utility library extension '"<<extension<<"' is not supported."<<std::endl;
OSG_NOTIFY(INFO)<<"OpenGL utility library extension '"<<extension<<"' is not supported."<<std::endl;
}
return result;
@@ -333,7 +333,7 @@ std::string& osg::getGLExtensionDisableString()
void* osg::getGLExtensionFuncPtr(const char *funcName)
{
// NOTIFY(osg::NOTICE)<<"osg::getGLExtensionFuncPtr("<<funcName<<")"<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"osg::getGLExtensionFuncPtr("<<funcName<<")"<<std::endl;
#if defined(WIN32)

64
src/osg/GraphicsContext.cpp
View File

@@ -55,13 +55,13 @@ void GraphicsContext::setWindowingSystemInterface(WindowingSystemInterface* call
{
ref_ptr<GraphicsContext::WindowingSystemInterface> &wsref = windowingSystemInterfaceRef();
wsref = callback;
NOTIFY(osg::INFO)<<"GraphicsContext::setWindowingSystemInterface() "<<wsref.get()<<"\t"<<&wsref<<std::endl;
OSG_NOTIFY(osg::INFO)<<"GraphicsContext::setWindowingSystemInterface() "<<wsref.get()<<"\t"<<&wsref<<std::endl;
}
GraphicsContext::WindowingSystemInterface* GraphicsContext::getWindowingSystemInterface()
{
ref_ptr<GraphicsContext::WindowingSystemInterface> &wsref = windowingSystemInterfaceRef();
NOTIFY(osg::INFO)<<"GraphicsContext::getWindowingSystemInterface() "<<wsref.get()<<"\t"<<&wsref<<std::endl;
OSG_NOTIFY(osg::INFO)<<"GraphicsContext::getWindowingSystemInterface() "<<wsref.get()<<"\t"<<&wsref<<std::endl;
return wsref.get();
}
@@ -148,9 +148,9 @@ void GraphicsContext::ScreenIdentifier::setScreenIdentifier(const std::string& d
}
#if 0
NOTIFY(osg::NOTICE)<<" hostName ["<<hostName<<"]"<<std::endl;
NOTIFY(osg::NOTICE)<<" displayNum "<<displayNum<<std::endl;
NOTIFY(osg::NOTICE)<<" screenNum "<<screenNum<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" hostName ["<<hostName<<"]"<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" displayNum "<<displayNum<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" screenNum "<<screenNum<<std::endl;
#endif
}
@@ -226,11 +226,11 @@ public:
{
--_numContexts;
NOTIFY(osg::INFO)<<"decrementUsageCount()"<<_numContexts<<std::endl;
OSG_NOTIFY(osg::INFO)<<"decrementUsageCount()"<<_numContexts<<std::endl;
if (_numContexts <= 1 && _compileContext.valid())
{
NOTIFY(osg::INFO)<<"resetting compileContext "<<_compileContext.get()<<" refCount "<<_compileContext->referenceCount()<<std::endl;
OSG_NOTIFY(osg::INFO)<<"resetting compileContext "<<_compileContext.get()<<" refCount "<<_compileContext->referenceCount()<<std::endl;
_compileContext = 0;
}
@@ -261,7 +261,7 @@ unsigned int GraphicsContext::createNewContextID()
// reuse contextID;
itr->second._numContexts = 1;
NOTIFY(osg::INFO)<<"GraphicsContext::createNewContextID() reusing contextID="<<itr->first<<std::endl;
OSG_NOTIFY(osg::INFO)<<"GraphicsContext::createNewContextID() reusing contextID="<<itr->first<<std::endl;
return itr->first;
}
@@ -270,8 +270,8 @@ unsigned int GraphicsContext::createNewContextID()
unsigned int contextID = s_contextIDMap.size();
s_contextIDMap[contextID]._numContexts = 1;
NOTIFY(osg::INFO)<<"GraphicsContext::createNewContextID() creating contextID="<<contextID<<std::endl;
NOTIFY(osg::INFO)<<"Updating the MaxNumberOfGraphicsContexts to "<<contextID+1<<std::endl;
OSG_NOTIFY(osg::INFO)<<"GraphicsContext::createNewContextID() creating contextID="<<contextID<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Updating the MaxNumberOfGraphicsContexts to "<<contextID+1<<std::endl;
// update the the maximum number of graphics contexts,
// to ensure that texture objects and display buffers are configured to the correct size.
@@ -298,7 +298,7 @@ void GraphicsContext::incrementContextIDUsageCount(unsigned int contextID)
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_contextIDMapMutex);
NOTIFY(osg::INFO)<<"GraphicsContext::incrementContextIDUsageCount("<<contextID<<") to "<<s_contextIDMap[contextID]._numContexts<<std::endl;
OSG_NOTIFY(osg::INFO)<<"GraphicsContext::incrementContextIDUsageCount("<<contextID<<") to "<<s_contextIDMap[contextID]._numContexts<<std::endl;
s_contextIDMap[contextID].incrementUsageCount();
}
@@ -314,17 +314,17 @@ void GraphicsContext::decrementContextIDUsageCount(unsigned int contextID)
}
else
{
NOTIFY(osg::NOTICE)<<"Warning: decrementContextIDUsageCount("<<contextID<<") called on expired contextID."<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"Warning: decrementContextIDUsageCount("<<contextID<<") called on expired contextID."<<std::endl;
}
NOTIFY(osg::INFO)<<"GraphicsContext::decrementContextIDUsageCount("<<contextID<<") to "<<s_contextIDMap[contextID]._numContexts<<std::endl;
OSG_NOTIFY(osg::INFO)<<"GraphicsContext::decrementContextIDUsageCount("<<contextID<<") to "<<s_contextIDMap[contextID]._numContexts<<std::endl;
}
void GraphicsContext::registerGraphicsContext(GraphicsContext* gc)
{
NOTIFY(osg::INFO)<<"GraphicsContext::registerGraphicsContext "<<gc<<std::endl;
OSG_NOTIFY(osg::INFO)<<"GraphicsContext::registerGraphicsContext "<<gc<<std::endl;
if (!gc) return;
@@ -338,7 +338,7 @@ void GraphicsContext::registerGraphicsContext(GraphicsContext* gc)
void GraphicsContext::unregisterGraphicsContext(GraphicsContext* gc)
{
NOTIFY(osg::INFO)<<"GraphicsContext::unregisterGraphicsContext "<<gc<<std::endl;
OSG_NOTIFY(osg::INFO)<<"GraphicsContext::unregisterGraphicsContext "<<gc<<std::endl;
if (!gc) return;
@@ -350,7 +350,7 @@ void GraphicsContext::unregisterGraphicsContext(GraphicsContext* gc)
GraphicsContext::GraphicsContexts GraphicsContext::getAllRegisteredGraphicsContexts()
{
NOTIFY(osg::INFO)<<"GraphicsContext::getAllRegisteredGraphicsContexts s_registeredContexts.size()="<<s_registeredContexts.size()<<std::endl;
OSG_NOTIFY(osg::INFO)<<"GraphicsContext::getAllRegisteredGraphicsContexts s_registeredContexts.size()="<<s_registeredContexts.size()<<std::endl;
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_contextIDMapMutex);
return s_registeredContexts;
}
@@ -368,14 +368,14 @@ GraphicsContext::GraphicsContexts GraphicsContext::getRegisteredGraphicsContexts
if (gc->getState() && gc->getState()->getContextID()==contextID) contexts.push_back(gc);
}
NOTIFY(osg::INFO)<<"GraphicsContext::getRegisteredGraphicsContexts "<<contextID<<" contexts.size()="<<contexts.size()<<std::endl;
OSG_NOTIFY(osg::INFO)<<"GraphicsContext::getRegisteredGraphicsContexts "<<contextID<<" contexts.size()="<<contexts.size()<<std::endl;
return contexts;
}
GraphicsContext* GraphicsContext::getOrCreateCompileContext(unsigned int contextID)
{
NOTIFY(osg::NOTICE)<<"GraphicsContext::createCompileContext."<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"GraphicsContext::createCompileContext."<<std::endl;
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_contextIDMapMutex);
@@ -407,7 +407,7 @@ GraphicsContext* GraphicsContext::getOrCreateCompileContext(unsigned int context
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_contextIDMapMutex);
s_contextIDMap[contextID]._compileContext = gc;
NOTIFY(osg::NOTICE)<<" succeeded GraphicsContext::createCompileContext."<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<" succeeded GraphicsContext::createCompileContext."<<std::endl;
return gc.release();
}
else
@@ -425,7 +425,7 @@ void GraphicsContext::setCompileContext(unsigned int contextID, GraphicsContext*
GraphicsContext* GraphicsContext::getCompileContext(unsigned int contextID)
{
// NOTIFY(osg::NOTICE)<<"GraphicsContext::getCompileContext "<<contextID<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"GraphicsContext::getCompileContext "<<contextID<<std::endl;
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(s_contextIDMapMutex);
ContextIDMap::iterator itr = s_contextIDMap.find(contextID);
if (itr != s_contextIDMap.end()) return itr->second._compileContext.get();
@@ -496,7 +496,7 @@ bool GraphicsContext::realize()
void GraphicsContext::close(bool callCloseImplementation)
{
NOTIFY(osg::INFO)<<"close("<<callCloseImplementation<<")"<<this<<std::endl;
OSG_NOTIFY(osg::INFO)<<"close("<<callCloseImplementation<<")"<<this<<std::endl;
// switch off the graphics thread...
setGraphicsThread(0);
@@ -518,7 +518,7 @@ void GraphicsContext::close(bool callCloseImplementation)
Camera* camera = (*itr);
if (camera)
{
NOTIFY(osg::INFO)<<"Releasing GL objects for Camera="<<camera<<" _state="<<_state.get()<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Releasing GL objects for Camera="<<camera<<" _state="<<_state.get()<<std::endl;
camera->releaseGLObjects(_state.get());
}
}
@@ -526,16 +526,16 @@ void GraphicsContext::close(bool callCloseImplementation)
if (callCloseImplementation && _state.valid() && isRealized())
{
NOTIFY(osg::INFO)<<"Closing still viable window "<<sharedContextExists<<" _state->getContextID()="<<_state->getContextID()<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Closing still viable window "<<sharedContextExists<<" _state->getContextID()="<<_state->getContextID()<<std::endl;
if (makeCurrent())
{
NOTIFY(osg::INFO)<<"Doing delete of GL objects"<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Doing delete of GL objects"<<std::endl;
osg::deleteAllGLObjects(_state->getContextID());
NOTIFY(osg::INFO)<<"Done delete of GL objects"<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Done delete of GL objects"<<std::endl;
_state->reset();
@@ -543,7 +543,7 @@ void GraphicsContext::close(bool callCloseImplementation)
}
else
{
NOTIFY(osg::INFO)<<"makeCurrent did not succeed, could not do flush/deletion of OpenGL objects."<<std::endl;
OSG_NOTIFY(osg::INFO)<<"makeCurrent did not succeed, could not do flush/deletion of OpenGL objects."<<std::endl;
}
}
@@ -555,7 +555,7 @@ void GraphicsContext::close(bool callCloseImplementation)
// does not work.
if (_state.valid())
{
NOTIFY(osg::INFO)<<"Doing discard of deleted OpenGL objects."<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Doing discard of deleted OpenGL objects."<<std::endl;
osg::discardAllGLObjects(_state->getContextID());
}
@@ -661,7 +661,7 @@ void GraphicsContext::setGraphicsThread(GraphicsThread* gt)
void GraphicsContext::add(Operation* operation)
{
NOTIFY(osg::INFO)<<"Doing add"<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Doing add"<<std::endl;
// acquire the lock on the operations queue to prevent anyone else for modifying it at the same time
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex);
@@ -674,7 +674,7 @@ void GraphicsContext::add(Operation* operation)
void GraphicsContext::remove(Operation* operation)
{
NOTIFY(osg::INFO)<<"Doing remove operation"<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Doing remove operation"<<std::endl;
// acquire the lock on the operations queue to prevent anyone else for modifying it at the same time
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex);
@@ -694,7 +694,7 @@ void GraphicsContext::remove(Operation* operation)
void GraphicsContext::remove(const std::string& name)
{
NOTIFY(osg::INFO)<<"Doing remove named operation"<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Doing remove named operation"<<std::endl;
// acquire the lock on the operations queue to prevent anyone else for modifying it at the same time
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex);
@@ -715,7 +715,7 @@ void GraphicsContext::remove(const std::string& name)
void GraphicsContext::removeAllOperations()
{
NOTIFY(osg::INFO)<<"Doing remove all operations"<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Doing remove all operations"<<std::endl;
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex);
_operations.clear();
@@ -775,7 +775,7 @@ void GraphicsContext::runOperations()
if (_currentOperation.valid())
{
// NOTIFY(osg::INFO)<<"Doing op "<<_currentOperation->getName()<<" "<<this<<std::endl;
// OSG_NOTIFY(osg::INFO)<<"Doing op "<<_currentOperation->getName()<<" "<<this<<std::endl;
// call the graphics operation.
(*_currentOperation)(this);

46
src/osg/OperationThread.cpp
View File

@@ -76,22 +76,22 @@ ref_ptr<Operation> OperationQueue::getNextOperation(bool blockIfEmpty)
if (!currentOperation->getKeep())
{
// NOTIFY(osg::INFO)<<"removing "<<currentOperation->getName()<<std::endl;
// OSG_NOTIFY(osg::INFO)<<"removing "<<currentOperation->getName()<<std::endl;
// remove it from the operations queue
_currentOperationIterator = _operations.erase(_currentOperationIterator);
// NOTIFY(osg::INFO)<<"size "<<_operations.size()<<std::endl;
// OSG_NOTIFY(osg::INFO)<<"size "<<_operations.size()<<std::endl;
if (_operations.empty())
{
// NOTIFY(osg::INFO)<<"setting block "<<_operations.size()<<std::endl;
// OSG_NOTIFY(osg::INFO)<<"setting block "<<_operations.size()<<std::endl;
_operationsBlock->set(false);
}
}
else
{
// NOTIFY(osg::INFO)<<"increment "<<_currentOperation->getName()<<std::endl;
// OSG_NOTIFY(osg::INFO)<<"increment "<<_currentOperation->getName()<<std::endl;
// move on to the next operation in the list.
++_currentOperationIterator;
@@ -102,7 +102,7 @@ ref_ptr<Operation> OperationQueue::getNextOperation(bool blockIfEmpty)
void OperationQueue::add(Operation* operation)
{
NOTIFY(osg::INFO)<<"Doing add"<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Doing add"<<std::endl;
// acquire the lock on the operations queue to prevent anyone else for modifying it at the same time
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex);
@@ -115,7 +115,7 @@ void OperationQueue::add(Operation* operation)
void OperationQueue::remove(Operation* operation)
{
NOTIFY(osg::INFO)<<"Doing remove operation"<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Doing remove operation"<<std::endl;
// acquire the lock on the operations queue to prevent anyone else for modifying it at the same time
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex);
@@ -138,7 +138,7 @@ void OperationQueue::remove(Operation* operation)
void OperationQueue::remove(const std::string& name)
{
NOTIFY(osg::INFO)<<"Doing remove named operation"<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Doing remove named operation"<<std::endl;
// acquire the lock on the operations queue to prevent anyone else for modifying it at the same time
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex);
@@ -166,7 +166,7 @@ void OperationQueue::remove(const std::string& name)
void OperationQueue::removeAllOperations()
{
NOTIFY(osg::INFO)<<"Doing remove all operations"<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Doing remove all operations"<<std::endl;
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_operationsMutex);
@@ -203,7 +203,7 @@ void OperationQueue::runOperations(Object* callingObject)
++_currentOperationIterator;
}
// NOTIFY(osg::INFO)<<"Doing op "<<_currentOperation->getName()<<" "<<this<<std::endl;
// OSG_NOTIFY(osg::INFO)<<"Doing op "<<_currentOperation->getName()<<" "<<this<<std::endl;
// call the graphics operation.
(*operation)(callingObject);
@@ -258,11 +258,11 @@ OperationThread::OperationThread():
OperationThread::~OperationThread()
{
//NOTIFY(osg::NOTICE)<<"Destructing graphics thread "<<this<<std::endl;
//OSG_NOTIFY(osg::NOTICE)<<"Destructing graphics thread "<<this<<std::endl;
cancel();
//NOTIFY(osg::NOTICE)<<"Done Destructing graphics thread "<<this<<std::endl;
//OSG_NOTIFY(osg::NOTICE)<<"Done Destructing graphics thread "<<this<<std::endl;
}
void OperationThread::setOperationQueue(OperationQueue* opq)
@@ -286,13 +286,13 @@ void OperationThread::setDone(bool done)
if (done)
{
NOTIFY(osg::INFO)<<"set done "<<this<<std::endl;
OSG_NOTIFY(osg::INFO)<<"set done "<<this<<std::endl;
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_threadMutex);
if (_currentOperation.valid())
{
NOTIFY(osg::INFO)<<"releasing "<<_currentOperation.get()<<std::endl;
OSG_NOTIFY(osg::INFO)<<"releasing "<<_currentOperation.get()<<std::endl;
_currentOperation->release();
}
}
@@ -303,7 +303,7 @@ void OperationThread::setDone(bool done)
int OperationThread::cancel()
{
NOTIFY(osg::INFO)<<"Cancelling OperationThread "<<this<<" isRunning()="<<isRunning()<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Cancelling OperationThread "<<this<<" isRunning()="<<isRunning()<<std::endl;
int result = 0;
if( isRunning() )
@@ -311,7 +311,7 @@ int OperationThread::cancel()
_done = true;
NOTIFY(osg::INFO)<<" Doing cancel "<<this<<std::endl;
OSG_NOTIFY(osg::INFO)<<" Doing cancel "<<this<<std::endl;
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_threadMutex);
@@ -343,13 +343,13 @@ int OperationThread::cancel()
}
#endif
// commenting out debug info as it was cashing crash on exit, presumable
// due to NOTIFY or std::cout destructing earlier than this destructor.
NOTIFY(osg::DEBUG_INFO)<<" Waiting for OperationThread to cancel "<<this<<std::endl;
// due to OSG_NOTIFY or std::cout destructing earlier than this destructor.
OSG_NOTIFY(osg::DEBUG_INFO)<<" Waiting for OperationThread to cancel "<<this<<std::endl;
OpenThreads::Thread::YieldCurrentThread();
}
}
NOTIFY(osg::INFO)<<" OperationThread::cancel() thread cancelled "<<this<<" isRunning()="<<isRunning()<<std::endl;
OSG_NOTIFY(osg::INFO)<<" OperationThread::cancel() thread cancelled "<<this<<" isRunning()="<<isRunning()<<std::endl;
return result;
}
@@ -381,13 +381,13 @@ void OperationThread::removeAllOperations()
void OperationThread::run()
{
NOTIFY(osg::INFO)<<"Doing run "<<this<<" isRunning()="<<isRunning()<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Doing run "<<this<<" isRunning()="<<isRunning()<<std::endl;
bool firstTime = true;
do
{
// NOTIFY(osg::NOTICE)<<"In thread loop "<<this<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"In thread loop "<<this<<std::endl;
ref_ptr<Operation> operation;
ref_ptr<OperationQueue> operationQueue;
@@ -407,7 +407,7 @@ void OperationThread::run()
_currentOperation = operation;
}
// NOTIFY(osg::INFO)<<"Doing op "<<_currentOperation->getName()<<" "<<this<<std::endl;
// OSG_NOTIFY(osg::INFO)<<"Doing op "<<_currentOperation->getName()<<" "<<this<<std::endl;
// call the graphics operation.
(*operation)(_parent.get());
@@ -426,10 +426,10 @@ void OperationThread::run()
firstTime = false;
}
// NOTIFY(osg::NOTICE)<<"operations.size()="<<_operations.size()<<" done="<<_done<<" testCancel()"<<testCancel()<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"operations.size()="<<_operations.size()<<" done="<<_done<<" testCancel()"<<testCancel()<<std::endl;
} while (!testCancel() && !_done);
NOTIFY(osg::INFO)<<"exit loop "<<this<<" isRunning()="<<isRunning()<<std::endl;
OSG_NOTIFY(osg::INFO)<<"exit loop "<<this<<" isRunning()="<<isRunning()<<std::endl;
}

94
src/osg/State.cpp
View File

@@ -158,7 +158,7 @@ State::~State()
//_vertexAttribArrayList.clear();
// NOTIFY(osg::NOTICE)<<"State::~State()"<<this<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"State::~State()"<<this<<std::endl;
for(AppliedProgramObjectSet::iterator itr = _appliedProgramObjectSet.begin();
itr != _appliedProgramObjectSet.end();
++itr)
@@ -173,7 +173,7 @@ void State::objectDeleted(void* object)
AppliedProgramObjectSet::iterator itr = _appliedProgramObjectSet.find(ppcp);
if (itr != _appliedProgramObjectSet.end())
{
// NOTIFY(osg::NOTICE)<<"Removing _appliedProgramObjectSet entry "<<ppcp<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"Removing _appliedProgramObjectSet entry "<<ppcp<<std::endl;
_appliedProgramObjectSet.erase(itr);
}
}
@@ -293,14 +293,14 @@ void State::setMaxTexturePoolSize(unsigned int size)
{
_maxTexturePoolSize = size;
osg::Texture::getTextureObjectManager(getContextID())->setMaxTexturePoolSize(size);
NOTIFY(osg::INFO)<<"osg::State::_maxTexturePoolSize="<<_maxTexturePoolSize<<std::endl;
OSG_NOTIFY(osg::INFO)<<"osg::State::_maxTexturePoolSize="<<_maxTexturePoolSize<<std::endl;
}
void State::setMaxBufferObjectPoolSize(unsigned int size)
{
_maxBufferObjectPoolSize = size;
osg::GLBufferObjectManager::getGLBufferObjectManager(getContextID())->setMaxGLBufferObjectPoolSize(_maxBufferObjectPoolSize);
NOTIFY(osg::INFO)<<"osg::State::_maxBufferObjectPoolSize="<<_maxBufferObjectPoolSize<<std::endl;
OSG_NOTIFY(osg::INFO)<<"osg::State::_maxBufferObjectPoolSize="<<_maxBufferObjectPoolSize<<std::endl;
}
void State::pushStateSet(const StateSet* dstate)
@@ -332,12 +332,12 @@ void State::pushStateSet(const StateSet* dstate)
pushUniformList(_uniformMap,dstate->getUniformList());
}
// NOTIFY(osg::NOTICE)<<"State::pushStateSet()"<<_stateStateStack.size()<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"State::pushStateSet()"<<_stateStateStack.size()<<std::endl;
}
void State::popAllStateSets()
{
// NOTIFY(osg::NOTICE)<<"State::popAllStateSets()"<<_stateStateStack.size()<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"State::popAllStateSets()"<<_stateStateStack.size()<<std::endl;
while (!_stateStateStack.empty()) popStateSet();
@@ -349,7 +349,7 @@ void State::popAllStateSets()
void State::popStateSet()
{
// NOTIFY(osg::NOTICE)<<"State::popStateSet()"<<_stateStateStack.size()<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"State::popStateSet()"<<_stateStateStack.size()<<std::endl;
if (_stateStateStack.empty()) return;
@@ -414,7 +414,7 @@ void State::removeStateSet(unsigned int pos)
{
if (pos >= _stateStateStack.size())
{
NOTIFY(osg::NOTICE)<<"Warning: State::removeStateSet("<<pos<<") out of range"<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"Warning: State::removeStateSet("<<pos<<") out of range"<<std::endl;
return;
}
@@ -784,7 +784,7 @@ void State::setInterleavedArrays( GLenum format, GLsizei stride, const GLvoid* p
#if defined(OSG_GL_VERTEX_ARRAY_FUNCS_AVAILABLE) && !defined(OSG_GLES1_AVAILABLE)
glInterleavedArrays( format, stride, pointer);
#else
NOTIFY(osg::NOTICE)<<"Warning: State::setInterleavedArrays(..) not implemented."<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"Warning: State::setInterleavedArrays(..) not implemented."<<std::endl;
#endif
// the crude way, assume that all arrays have been effected so dirty them and
@@ -921,7 +921,7 @@ void State::setVertexAttribPointer( unsigned int index,
{
if (_glVertexAttribPointer)
{
// NOTIFY(osg::NOTICE)<<"State::setVertexAttribPointer("<<index<<",...)"<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"State::setVertexAttribPointer("<<index<<",...)"<<std::endl;
if ( index >= _vertexAttribArrayList.size()) _vertexAttribArrayList.resize(index+1);
EnabledArrayPair& eap = _vertexAttribArrayList[index];
@@ -929,12 +929,12 @@ void State::setVertexAttribPointer( unsigned int index,
if (!eap._enabled || eap._dirty)
{
eap._enabled = true;
// NOTIFY(osg::NOTICE)<<" _glEnableVertexAttribArray( "<<index<<" )"<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<" _glEnableVertexAttribArray( "<<index<<" )"<<std::endl;
_glEnableVertexAttribArray( index );
}
//if (eap._pointer != ptr || eap._normalized!=normalized || eap._dirty)
{
// NOTIFY(osg::NOTICE)<<" _glVertexAttribPointer( "<<index<<" )"<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<" _glVertexAttribPointer( "<<index<<" )"<<std::endl;
_glVertexAttribPointer( index, size, type, normalized, stride, ptr );
eap._pointer = ptr;
eap._normalized = normalized;
@@ -957,7 +957,7 @@ void State::disableVertexAttribPointer( unsigned int index )
{
eap._enabled = false;
eap._dirty = false;
// NOTIFY(osg::NOTICE)<<" _glDisableVertexAttribArray( "<<index<<" )"<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<" _glDisableVertexAttribArray( "<<index<<" )"<<std::endl;
_glDisableVertexAttribArray( index );
}
}
@@ -974,7 +974,7 @@ void State::disableVertexAttribPointersAboveAndIncluding( unsigned int index )
{
eap._enabled = false;
eap._dirty = false;
// NOTIFY(osg::NOTICE)<<" State::disableVertexAttribPointersAboveAndIncluding(): _glDisableVertexAttribArray( "<<index<<" )"<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<" State::disableVertexAttribPointersAboveAndIncluding(): _glDisableVertexAttribArray( "<<index<<" )"<<std::endl;
_glDisableVertexAttribArray( index );
}
++index;
@@ -984,7 +984,7 @@ void State::disableVertexAttribPointersAboveAndIncluding( unsigned int index )
void State::lazyDisablingOfVertexAttributes()
{
// NOTIFY(osg::NOTICE)<<"lazyDisablingOfVertexAttributes()"<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"lazyDisablingOfVertexAttributes()"<<std::endl;
if (!_useVertexAttributeAliasing)
{
_vertexArray._lazy_disable = true;
@@ -1010,7 +1010,7 @@ void State::lazyDisablingOfVertexAttributes()
void State::applyDisablingOfVertexAttributes()
{
//NOTIFY(osg::NOTICE)<<"start of applyDisablingOfVertexAttributes()"<<std::endl;
//OSG_NOTIFY(osg::NOTICE)<<"start of applyDisablingOfVertexAttributes()"<<std::endl;
if (!_useVertexAttributeAliasing)
{
if (_vertexArray._lazy_disable) disableVertexPointer();
@@ -1027,7 +1027,7 @@ void State::applyDisablingOfVertexAttributes()
{
if (_vertexAttribArrayList[i]._lazy_disable) disableVertexAttribPointer(i);
}
// NOTIFY(osg::NOTICE)<<"end of applyDisablingOfVertexAttributes()"<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"end of applyDisablingOfVertexAttributes()"<<std::endl;
}
@@ -1061,39 +1061,39 @@ bool State::checkGLErrors(const char* str) const
const char* error = (char*)gluErrorString(errorNo);
if (error)
{
NOTIFY(WARN)<<"Warning: detected OpenGL error '" << error<<"'";
OSG_NOTIFY(WARN)<<"Warning: detected OpenGL error '" << error<<"'";
}
else
{
NOTIFY(WARN)<<"Warning: detected OpenGL error number 0x" << std::hex << errorNo << std::dec;
OSG_NOTIFY(WARN)<<"Warning: detected OpenGL error number 0x" << std::hex << errorNo << std::dec;
}
#else
switch(errorNo)
{
case(GL_INVALID_ENUM):
NOTIFY(WARN)<<"Warning: detected OpenGL error GL_INVALID_ENUM";
OSG_NOTIFY(WARN)<<"Warning: detected OpenGL error GL_INVALID_ENUM";
break;
case(GL_INVALID_VALUE):
NOTIFY(WARN)<<"Warning: detected OpenGL error GL_INVALID_VALUE";
OSG_NOTIFY(WARN)<<"Warning: detected OpenGL error GL_INVALID_VALUE";
break;
case(GL_INVALID_OPERATION):
NOTIFY(WARN)<<"Warning: detected OpenGL error GL_INVALID_OPERATION";
OSG_NOTIFY(WARN)<<"Warning: detected OpenGL error GL_INVALID_OPERATION";
break;
case(GL_OUT_OF_MEMORY):
NOTIFY(WARN)<<"Warning: detected OpenGL error GL_OUT_OF_MEMORY";
OSG_NOTIFY(WARN)<<"Warning: detected OpenGL error GL_OUT_OF_MEMORY";
break;
default:
NOTIFY(WARN)<<"Warning: detected OpenGL error number 0x" << std::hex << errorNo << std::dec;
OSG_NOTIFY(WARN)<<"Warning: detected OpenGL error number 0x" << std::hex << errorNo << std::dec;
break;
}
#endif
if (str)
{
NOTIFY(WARN)<<" at "<<str<< std::endl;
OSG_NOTIFY(WARN)<<" at "<<str<< std::endl;
}
else
{
NOTIFY(WARN)<<" in osg::State."<< std::endl;
OSG_NOTIFY(WARN)<<" in osg::State."<< std::endl;
}
return true;
@@ -1110,29 +1110,29 @@ bool State::checkGLErrors(StateAttribute::GLMode mode) const
const char* error = (char*)gluErrorString(errorNo);
if (error)
{
NOTIFY(WARN)<<"Warning: detected OpenGL error '"<< error <<"' after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
OSG_NOTIFY(WARN)<<"Warning: detected OpenGL error '"<< error <<"' after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
}
else
{
NOTIFY(WARN)<<"Warning: detected OpenGL error number 0x"<< std::hex << errorNo <<" after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
OSG_NOTIFY(WARN)<<"Warning: detected OpenGL error number 0x"<< std::hex << errorNo <<" after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
}
#else
switch(errorNo)
{
case(GL_INVALID_ENUM):
NOTIFY(WARN)<<"Warning: detected OpenGL error GL_INVALID_ENUM after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
OSG_NOTIFY(WARN)<<"Warning: detected OpenGL error GL_INVALID_ENUM after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
break;
case(GL_INVALID_VALUE):
NOTIFY(WARN)<<"Warning: detected OpenGL error GL_INVALID_VALUE after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
OSG_NOTIFY(WARN)<<"Warning: detected OpenGL error GL_INVALID_VALUE after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
break;
case(GL_INVALID_OPERATION):
NOTIFY(WARN)<<"Warning: detected OpenGL error GL_INVALID_OPERATION after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
OSG_NOTIFY(WARN)<<"Warning: detected OpenGL error GL_INVALID_OPERATION after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
break;
case(GL_OUT_OF_MEMORY):
NOTIFY(WARN)<<"Warning: detected OpenGL error GL_OUT_OF_MEMORY after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
OSG_NOTIFY(WARN)<<"Warning: detected OpenGL error GL_OUT_OF_MEMORY after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
break;
default:
NOTIFY(WARN)<<"Warning: detected OpenGL error number 0x"<< std::hex << errorNo <<" after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
OSG_NOTIFY(WARN)<<"Warning: detected OpenGL error number 0x"<< std::hex << errorNo <<" after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
break;
}
#endif
@@ -1150,29 +1150,29 @@ bool State::checkGLErrors(const StateAttribute* attribute) const
const char* error = (char*)gluErrorString(errorNo);
if (error)
{
NOTIFY(WARN)<<"Warning: detected OpenGL error '"<< error <<"' after applying attribute "<<attribute->className()<<" "<<attribute<< std::endl;
OSG_NOTIFY(WARN)<<"Warning: detected OpenGL error '"<< error <<"' after applying attribute "<<attribute->className()<<" "<<attribute<< std::endl;
}
else
{
NOTIFY(WARN)<<"Warning: detected OpenGL error number 0x"<< std::hex << errorNo <<" after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
OSG_NOTIFY(WARN)<<"Warning: detected OpenGL error number 0x"<< std::hex << errorNo <<" after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
}
#else
switch(errorNo)
{
case(GL_INVALID_ENUM):
NOTIFY(WARN)<<"Warning: detected OpenGL error GL_INVALID_ENUM after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
OSG_NOTIFY(WARN)<<"Warning: detected OpenGL error GL_INVALID_ENUM after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
break;
case(GL_INVALID_VALUE):
NOTIFY(WARN)<<"Warning: detected OpenGL error GL_INVALID_VALUE after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
OSG_NOTIFY(WARN)<<"Warning: detected OpenGL error GL_INVALID_VALUE after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
break;
case(GL_INVALID_OPERATION):
NOTIFY(WARN)<<"Warning: detected OpenGL error GL_INVALID_OPERATION after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
OSG_NOTIFY(WARN)<<"Warning: detected OpenGL error GL_INVALID_OPERATION after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
break;
case(GL_OUT_OF_MEMORY):
NOTIFY(WARN)<<"Warning: detected OpenGL error GL_OUT_OF_MEMORY after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
OSG_NOTIFY(WARN)<<"Warning: detected OpenGL error GL_OUT_OF_MEMORY after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
break;
default:
NOTIFY(WARN)<<"Warning: detected OpenGL error number 0x"<< std::hex << errorNo <<" after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
OSG_NOTIFY(WARN)<<"Warning: detected OpenGL error number 0x"<< std::hex << errorNo <<" after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
break;
}
#endif
@@ -1231,9 +1231,9 @@ namespace State_Utils
bool State::convertVertexShaderSourceToOsgBuiltIns(std::string& source) const
{
NOTIFY(osg::NOTICE)<<"State::convertShaderSourceToOsgBuiltIns()"<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"State::convertShaderSourceToOsgBuiltIns()"<<std::endl;
NOTIFY(osg::NOTICE)<<"++Before Converted source "<<std::endl<<source<<std::endl<<"++++++++"<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"++Before Converted source "<<std::endl<<source<<std::endl<<"++++++++"<<std::endl;
// replace ftransform as it only works with built-ins
State_Utils::replace(source, "ftransform()", "gl_ModelViewProjectionMatrix * gl_Vertex");
@@ -1259,7 +1259,7 @@ bool State::convertVertexShaderSourceToOsgBuiltIns(std::string& source) const
State_Utils::replaceAndInsertDeclaration(source, "gl_ProjectionMatrix", "osg_ProjectionMatrix", "uniform mat4 ");
State_Utils::replaceAndInsertDeclaration(source, "gl_NormalMatrix", "osg_NormalMatrix", "uniform mat3 ");
NOTIFY(osg::NOTICE)<<"-------- Converted source "<<std::endl<<source<<std::endl<<"----------------"<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"-------- Converted source "<<std::endl<<source<<std::endl<<"----------------"<<std::endl;
return true;
}
@@ -1344,7 +1344,7 @@ void State::updateModelViewAndProjectionMatrixUniforms()
void State::drawQuads(GLint first, GLsizei count, GLsizei primCount)
{
// NOTIFY(osg::NOTICE)<<"State::drawQuads("<<first<<", "<<count<<")"<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"State::drawQuads("<<first<<", "<<count<<")"<<std::endl;
unsigned int array = first % 4;
unsigned int offsetFirst = ((first-array) / 4) * 6;
@@ -1354,7 +1354,7 @@ void State::drawQuads(GLint first, GLsizei count, GLsizei primCount)
Indices& indices = _quadIndices[array];
if (endOfIndices>65536)
{
NOTIFY(osg::NOTICE)<<"Warning: State::drawQuads("<<first<<", "<<count<<") too large handle in remapping to ushort glDrawElements."<<std::endl;
OSG_NOTIFY(osg::NOTICE)<<"Warning: State::drawQuads("<<first<<", "<<count<<") too large handle in remapping to ushort glDrawElements."<<std::endl;
endOfIndices = 65536;
}
@@ -1375,13 +1375,13 @@ void State::drawQuads(GLint first, GLsizei count, GLsizei primCount)
indices.push_back(base+2);
indices.push_back(base+3);
// NOTIFY(osg::NOTICE)<<" adding quad indices ("<<base<<")"<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<" adding quad indices ("<<base<<")"<<std::endl;
}
}
// if (array!=0) return;
// NOTIFY(osg::NOTICE)<<" glDrawElements(GL_TRIANGLES, "<<numIndices<<", GL_UNSIGNED_SHORT, "<<&(indices[base])<<")"<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<" glDrawElements(GL_TRIANGLES, "<<numIndices<<", GL_UNSIGNED_SHORT, "<<&(indices[base])<<")"<<std::endl;
glDrawElementsInstanced(GL_TRIANGLES, numIndices, GL_UNSIGNED_SHORT, &(indices[offsetFirst]), primCount);
}

6
src/osg/View.cpp
View File

@@ -20,7 +20,7 @@ using namespace osg;
View::View():
Object(true)
{
// NOTIFY(osg::NOTICE)<<"Constructing osg::View"<<std::endl;
// OSG_NOTIFY(osg::NOTICE)<<"Constructing osg::View"<<std::endl;
setLightingMode(HEADLIGHT);
@@ -52,7 +52,7 @@ View::View(const osg::View& view, const osg::CopyOp& copyop):
View::~View()
{
NOTIFY(osg::INFO)<<"Destructing osg::View"<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Destructing osg::View"<<std::endl;
if (_camera.valid())
{
@@ -82,7 +82,7 @@ View::~View()
}
#endif
NOTIFY(osg::INFO)<<"Done destructing osg::View"<<std::endl;
OSG_NOTIFY(osg::INFO)<<"Done destructing osg::View"<<std::endl;
}
void View::take(osg::View& rhs)