Changeset 299

Timestamp:

10/16/06 09:11:30 (2 years ago)

Author:

dirk

Message:

Fixed mem leak (State regenerated)
Adaptive bucket sort (buggy, disabled)
public stats

Files:

• branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGOcclusionCullingTreeBuilder.cpp (modified) (5 diffs)
• branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGOcclusionCullingTreeBuilder.h (modified) (4 diffs)
• branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/build.info (modified) (1 diff)
• branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/testOcclusionCulling.cpp (modified) (12 diffs)

branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGOcclusionCullingTreeBuilder.cpp

@@ -91 +91 @@
-    "percentage of successful tests for occlusion");
-
+
+bool      OcclusionCullingTreeBuilder::_isOccStateCreated = false;
+StatePtr  OcclusionCullingTreeBuilder::_testingStatePtr;
+State    *OcclusionCullingTreeBuilder::_testingState;
+
-// Some typedefs to clean up OpenGL extension handling
-
@@ -121 +126 @@
-      
-    _buckets.clear();
-
+
+
+
-}
-
-OcclusionCullingTreeBuilder::~OcclusionCullingTreeBuilder(void)
-{
+    // Should delete queries here, but those need GL context...
+    delete [] _testSamples;
-}
-
@@ -136 +145 @@
-    _buckets.clear();
-    _buckets.resize(_nBuckets);
+    _bucketsWork.clear();
+    _bucketsWork.resize(_nBuckets);
+   
+    _bucketLow   = 0.f;
+    _bucketHigh  = 0.f;
+    _bucketScale = 0.f;
-}
-
@@ -176 +191 @@
-        GenQueryT genquer = (GenQueryT)win->getFunction(_funcGenQueriesARB);
-        genquer(uNumNodes, _testSamples);
-
+
+
+
+
+
+
-        // Create an empty state to render test nodes.
-        _testingStatePtr = State::create();
@@ -630 +650 @@
-    }
-    
+    // Assumed to be between 0 and 1 for fixed bucket sort. Adaptive doesn't
+    // care.
+    float val = pNode->getScalar();
+    
-    if(_pRoot == NULL)
-    {
-        _pRoot = _pNodePool->create();
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    int index = osgClamp(0, static_cast<int>(val * _nBuckets), _nBuckets - 1);
-    

branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGOcclusionCullingTreeBuilder.h

@@ -81 +81 @@
-   
-    static OcclusionCullingTreeBuilder Proto;
+
+    static StatElemDesc<StatIntElem>  statNOccNodes;
+    static StatElemDesc<StatIntElem>  statNOccTests;
+    static StatElemDesc<StatIntElem>  statNOccInvisible;
+    static StatElemDesc<StatRealElem> statNOccSuccessTestPer;
-    
-    //-----------------------------------------------------------------------
@@ -188 +193 @@
-    static UInt32 _funcEndQueryARB;
-
-
-
-
-
+
+
+
-
-    GLuint* _testSamples;
@@ -200 +204 @@
-    static const int _nBuckets = 1000;     //!< number of buckets for approximate sorting
-    std::vector<RenderTreeNode*> _buckets; //!< buckets for approximate sorting
+    std::vector<RenderTreeNode*> _bucketsWork; //!< work copy of buckets
+    Real32 _bucketLow;                     //!< value for lowest bucket
+    Real32 _bucketHigh;                    //!< value for highest bucket
+    Real32 _bucketScale;                   //!< 1 / all buckets width
+    
-    std::vector<RenderTreeNode*> _testNodes; //!< Nodes currently being tested
-
@@ -209 +218 @@
-    Int32                   _vpWidth;
-    Int32                   _vpHeight;
-    StatePtr                _testingStatePtr;
-    State                  *_testingState;
-    RenderTraversalAction  *_rt;
-    UInt32                 _minFeatureSize;

branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/build.info

@@ -7 +7 @@
-   osg_dep_libs = ['OSGBase','OSGSystem','OSGGroup','OSGState','OSGDrawable', 'OSGWindow']
-
+   # This is only need in test, but I don't know how to add opt libs to test
+   nvperfsdk_option = opts.GetOption("NVPerfSDK")
+   
+   for option in [nvperfsdk_option]:
+      if option.isAvailable():
+         libs.append(option.library)
+         if option.incDir:
+            cpppath.append(option.incDir)
+         if option.libDir:
+            libpath.append(option.libDir)
+   
-   # Tests' dependencies
-
-   osg_test_libs =  ['OSGGroup', 'OSGDrawable', 'OSGState', 'OSGFileIO', 
-                     'OSGWindowX', 'OSGUtil','OSGText', 'OSGWindowGLUT']
+   
-   test_cpppath = []
-   test_libpath = []

branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/testOcclusionCulling.cpp

@@ -2 +2 @@
-#include <OSGGLUT.h>
-#include <OSGConfig.h>
+#include <OSGConfigured.h>
-#include <OSGSimpleGeometry.h>
-#include <OSGGLUTWindow.h>
@@ -18 +19 @@
-#include "OSGSHLChunk.h"
-
+#include "OSGStatStringElem.h"
+#include "OSGSimplePool.h"
+#include "OSGRenderTreeNode.h"
+#include "OSGOcclusionCullingTreeBuilder.h"
-
-OSG_USING_NAMESPACE
+
+#ifdef OSG_WITH_NVPERFSDK
+#include <NVPerfSDK.h>
+
+
+StatElemDesc<StatStringElem> GPUIdleStat("GPUIdle","GPUIdle");
+StatElemDesc<StatStringElem> PSBusyStat("PSBusyStat","PSBusyStat");
+StatElemDesc<StatStringElem> VSBusyStat("VSBusyStat","VSBusyStat");
+StatElemDesc<StatStringElem> TextureWaitStat("TextureWait","TextureWait");
+
+StatElemDesc<StatStringElem> *nvStatElems[] = 
+    { &GPUIdleStat, &PSBusyStat, &VSBusyStat, &TextureWaitStat };
+
+#endif
-
-SimpleSceneManager    *mgr;
-RenderTraversalAction *tact = NULL;
-RenderAction          *act = NULL;
+RenderAction          *debugact = NULL;
-
-GLUTWindowPtr mainwin;
@@ -29 +49 @@
-int mainwinid = -1, debugwinid = -1;
-
+SimpleStatisticsForegroundPtr statfg;
-StatCollector         *collector;
-
@@ -34 +55 @@
-bool debug = false;
-bool bGLFinish = false;
+
+
+
+#ifdef OSG_WITH_NVPERFSDK
+const GLuint counterEntryCount = 10;
+const GLuint bufferEntryCount = 10;
+
+// A simple class to manage counters, sampling, and display of the information
+class NVDataProvider
+{
+    public:
+        NVDataProvider()
+            {
+                // We're averaging these, so we'll need to initialize to zero
+                for (GLuint i = 0; i < counterEntryCount; i++) {
+                    for (GLuint j = 0; j < bufferEntryCount; j++) {
+                        m_counterValues[i][j] = 0.0f;
+                    }
+                }
+                m_counterIndexArrayCount = 0;
+                m_counterValuesRRIndex = 0;
+            }
+        
+        virtual size_t nCounters() const
+            {
+                return m_counterIndexArrayCount;
+            }
+
+        virtual bool add(GLuint counterIndex)
+            {
+                if (NVPMAddCounter(counterIndex) == NVPM_OK) {
+                    m_counterIndexArray[m_counterIndexArrayCount++] = counterIndex;
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+            
+        virtual bool add(char *counterName)
+            {
+                GLuint counterIndex;
+                if (NVPMGetCounterIndex(counterName, &counterIndex) == NVPM_OK) {
+                    return add(counterIndex);
+                } else {
+                    return false;
+                }
+            }
+
+        virtual bool removeAllCounters()
+            {
+                NVPMRemoveAllCounters();
+
+                while (m_counterIndexArrayCount) {
+                    m_counterIndexArray[--m_counterIndexArrayCount] = 0;
+                }
+                
+                return true;
+            }
+
+        virtual bool sample()
+            {
+                GLuint counterIndex, unused;
+                UINT64 events, cycles;
+
+                // Sample the GPU counters
+                NVPMSample(NULL, &unused);
+
+                // Retrieve the current sample values
+                for (counterIndex = 0;
+                     counterIndex < m_counterIndexArrayCount;
+                     counterIndex++) 
+                {
+                    NVPMGetCounterValue(m_counterIndexArray[counterIndex], 0, &events, &cycles);
+                    
+                    m_counterValues[counterIndex][m_counterValuesRRIndex] =
+                        100.0f * (float) events / (float) cycles;
+                }
+                m_counterValuesRRIndex++;
+                if (m_counterValuesRRIndex >= bufferEntryCount) {
+                    m_counterValuesRRIndex = 0;
+                }
+                
+                return true;
+            }
+            
+        virtual float value(const GLuint counterIndex) const
+            {
+                GLuint entryIndex;
+                GLfloat runningTotal = 0.0f;
+                for (entryIndex = 0; entryIndex < bufferEntryCount; entryIndex++) {
+                    runningTotal += 
+                        m_counterValues[counterIndex][entryIndex] / (float)bufferEntryCount;
+                }
+                return runningTotal;
+            }
+
+    protected:
+        GLuint m_counterIndexArray[counterEntryCount];
+        GLuint m_counterIndexArrayCount;
+
+        // Maintain a round-robin style buffer and display the average of the
+        // the last bufferEntryCount samples.
+        GLfloat m_counterValues[counterEntryCount][bufferEntryCount];
+        GLuint  m_counterValuesRRIndex;
+
+} g_nvDataProvider;    
+
+NVDataProvider *nvDataProvider = &g_nvDataProvider;
+#endif
-
-// redraw the window
@@ -40 +170 @@
-    if(glutGetWindow() == mainwinid)
-    {
+#ifdef OSG_WITH_NVPERFSDK
+        if(nvDataProvider->nCounters())
+        {
+            nvDataProvider->sample();
+
+            Char8 str[40];
+            
+            for(int i = 0; i < 4; ++i)
+            {
+                sprintf(str, "%s: %f", nvStatElems[i]->getDescription().str(),
+                         nvDataProvider->value(i)); 
+                StatStringElem *e = dynamic_cast<StatStringElem*>(
+                                        collector->getElem(*nvStatElems[i]));  
+                e->set(str);
+            }
+        }
+#endif
-        mgr->redraw();
-    }
-    else if(glutGetWindow() == debugwinid)
-    {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}
@@ -72 +231 @@
-        mgr->mouseButtonPress(button, x, y);
-
-
-
-
-
-
-
-
+
-}
-
@@ -86 +239 @@
-    mgr->mouseMove(x, y);
-
-
-
-
-
-
-
-
+
-}
-
@@ -111 +258 @@
-        case 27:    
-        {
+#ifdef OSG_WITH_NVPERFSDK
+            NVPMShutdown();
+#endif
-            osgExit();
-            exit(0);
@@ -175 +325 @@
-            act->setUseGLFinish(bGLFinish);
-            break;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -265 +488 @@
-    mgr->setUseTraversalAction(true);
-
-
-
+
+
+
-
-
@@ -316 +540 @@
-    // add the statistics forground
-    
-
-
+
-    
-    statfg->setSize(25);
-    statfg->setColor(Color4f(0,1,0,0.7));
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                       "%d matrix changes");
-
-Nod
-Action::statNTransGeometri
-transparent Nodes drawn
-Drawable::statNTriangle
-triangles drawn
-Drawable::statNLine
-lines drawn
-
-                   "%d points drawn");
-statfg->addElement(Drawable::statNPrimitives,
-                    "%d primitive groups drawn");
-statfg->addElement(Drawable::statNVertices, 
-                   "%d vertices transformed");
-statfg->addElement(RenderAction::statNTextures, "%d textures used
-RenderAction::statNTexBytes, "%d bytes of texture used");
-
- 
+Traversal
+Geometri
+TraversalAction::statNStat
+state changes
+RenderTraversalAction::statNShader
+shader changes
+RenderTraversalAction::statNShaderParam
+shader param changes
+
+statfg->addElement(OcclusionCullingTreeBuilder::statNOccNodes, 
+                   "%d nodes in draw tree");
+statfg->addElement(OcclusionCullingTreeBuilder::statNOccTests, 
+                   "%d occ tests");
+statfg->addElement(OcclusionCullingTreeBuilder::statNOccInvisible, 
+                   "%d invisible nodes
+OcclusionCullingTreeBuilder::statNOccSuccessTestPer, 
+
+
-    collector = &statfg->editCollector();
-
@@ -363 +578 @@
-        mainwin->getPort(0)->addForeground(statfg);
-    }
+
+#ifdef OSG_WITH_NVPERFSDK
+    NVPMRESULT status;
+
+    status = NVPMInit();
+    if (status != NVPM_OK) {
+        FFATAL(("NVPerfSDK failed to initialize - no GPU data will be available"));
+    }
+    else
+    {
+        nvDataProvider->add("gpu_idle");
+        nvDataProvider->add("pixel_shader_busy");
+        nvDataProvider->add("vertex_shader_busy");
+        nvDataProvider->add("shader_waits_for_texture");
+        
+        statfg->addElement(GPUIdleStat);
+        statfg->addElement(PSBusyStat);
+        statfg->addElement(VSBusyStat);
+        statfg->addElement(TextureWaitStat);
+         
+    }
+#endif
-    
-    // GLUT main loop