Changeset 345

Timestamp:

10/21/06 14:04:13 (2 years ago)

Author:

dshipton

Message:

Use a FIFO queue for the queries to help mix rendering, testing, and rendering results for decreased latency.

Files:

• branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGOcclusionCullingTreeBuilder.cpp (modified) (20 diffs)
• branches/Dirk_RenderTraversalWork/Source/System/Action/RenderTraversal/OSGOcclusionCullingTreeBuilder.h (modified) (5 diffs)

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

@@ -125 +125 @@
-: uNumNodes (0),
-  _isOccSetup(false),
-
+
+
-{
-    _extOcclusionQuery = Window::registerExtension("GL_ARB_occlusion_query");
@@ -221 +222 @@
-void OcclusionCullingTreeBuilder::draw(DrawEnv &denv, RenderPartition *part)
-{
+    //std::cout << "Frame Start" << std::endl;
-    Window* win = denv.getWindow();
-
@@ -248 +250 @@
-    if(!_isOccSetup)
-    {
-
+
+
+
-        //std::cout << "Performing OCC on " << uNumNodes << " nodes." << std::endl;
-
-        GenQueryT genquer = (GenQueryT)win->getFunction(_funcGenQueriesARB);
-uNumNod
+_numTestSampl
-        _isOccSetup = true;
-    }
@@ -283 +287 @@
-    //std::cout << "Calculated Pixels" << std::endl;
-
-
+
-    Viewport* vp = denv.getViewport();
-    _vpWidth = vp->getPixelWidth();
@@ -316 +320 @@
-    leaveTesting(denv, part);
-        
-
-
+
+
+
+
+
-
-    //std::cout << "Calc Pixels" << std::endl;
@@ -323 +330 @@
-
- 
-    sc->getElem(statNOccTests    )->add(_currSample);
-    sc->getElem(statNOccInvisible)->add(uNumNodes);
-    Real32 percentage = (Real32)sc->getElem(statNOccInvisible)->get() / (Real32)sc->getElem(statNOccTests)->get();
-    sc->getElem(statNOccSuccessTestPer)->set(percentage);
@@ -330 +335 @@
-    
-    //std::cout << "Real pixels " << std::endl;
-    //std::cout << " Next" << std::endl;
-    //std::cout << std::endl;
-
@@ -337 +341 @@
-    uNumNodes=0;
-    _currSample = 0;
-
-
+
+
+
-void OcclusionCullingTreeBuilder::testNode(RenderTreeNode *pNode, DrawEnv &denv, RenderPartition *part, Real32 &scr_percent)
-{
@@ -420 +425 @@
-
-//Make decision
-
+
+
+
-        {
-            //renderNode
@@ -429 +436 @@
-            //make decision
-            //if(0 > 1)
-
+ // Rendering major occluders
-            {
-                drawNode(pNode, denv, part);
@@ -436 +443 @@
-            else
-            {
+                        
-                Real32 pcov;
-                pcov = sqrt(scr_percent) - sqrt(cbb);
@@ -441 +449 @@
-                //std::cout << "cbb:" << cbb << " scr_percent:" << scr_percent <<" pcov:" << pcov << std::endl;
-                //if(scr_percent - pcov > 0.001)
-
+ // If within threshold or reall small
-                {
-                    if(cbb * _vpWidth * _vpHeight <= _minFeatureSize) //small feature culling
@@ -447 +455 @@
-                        pNode->setIsRendered(true);
-                    }
+                    else if(_testPendingNodes.size() == _numTestSamples - 1) // Make sure we have room to draw a test
+                    {
+                        drawTestResults(denv, part);
+                        if(_testPendingNodes.size() == _numTestSamples - 1) // If we are waiting on a result, draw a node
+                        {
+                            drawNode(pNode, denv, part);
+                        }
+                        else
+                        {
+                            drawTestNode(pNode, denv, part); // Made room, go ahead and draw a test node
+                        }
+                    }
-                    else
-                    {
-
+ //Plenty of room in buffer to draw a test node
-                    }
-                }
-                else
-                {
-
+ // Probably not being covered up...draw the real node
-                    //scr_percent+=cbb;
-                }
@@ -518 +538 @@
-    v[1][2] = v[2][2] = v[5][2] = v[6][2] = max[2];
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    enterTesting(denv, part);
+    StatCollector *sc = _rt->getStatistics();
+    sc->getElem(statNOccTests    )->inc();
-
-    BeginQueryT beginq = (BeginQueryT) win->getFunction(_funcBeginQueryARB);
-_currSample++
+//std::cout << "Push: " << _currSample << std::endl
-    pNode->setResultNum(_currSample);
-    beginq(GL_SAMPLES_PASSED_ARB, _testSamples[_currSample]);
@@ -539 +572 @@
-    }
-    glEnd();
-    //glLoadMatrixf(m);
-    //glMatrixMode(GL_MODELVIEW);
-    //glPopMatrix();
-
-    EndQueryT endq = (EndQueryT) win->getFunction(_funcEndQueryARB);               
-    endq(GL_SAMPLES_PASSED_ARB);
-//glEndQueryARB(GL_SAMPLES_PASSED_ARB
+_testPendingNodes.push(pNode
-}
-
@@ -594 +624 @@
-}
-
-
-
-
-
+
+
+
+
+
+
-        //DRAW DRAW DRAW
-        if(pNode->hasFunctor() == true && !pNode->getIsRendered())
@@ -606 +638 @@
-            GLuint available = 0;
-            getquiv(_testSamples[pNode->getResultNum()], GL_QUERY_RESULT_AVAILABLE_ARB, &available);
-
-
-
-
+
+
+
+
+
-            GLuint sampleCount = 100;  //XXX: Set to what it should be from calc above.
-
-
-
-
-
-
-
-
-
-
-
+
-            
-            //glGetQueryObjectuivARB(queries[i], GL_QUERY_RESULT_ARB, &sampleCount);
-            //std::cout << i << ":" << sampleCount << " ";
-            if(sampleCount > _visPixelThreshold)
-            {
+                leaveTesting(denv, part);
-                //MATRIX SETUP
-                UInt32 uiNextMatrix = pNode->getMatrixStore().first;
@@ -633 +655 @@
-                {
-                    glLoadMatrixf(pNode->getMatrixStore().second.getValues());
-
-                    _uiActiveMatrix = uiNextMatrix;
-
-                    _currMatrix.second = pNode->getMatrixStore().second;
-
-                    updateTopMatrix(denv);
-
-                    denv.setObjectToWorld(_accMatrix);
-
-                    ++part->_uiNumMatrixChanges;
-                }
@@ -673 +690 @@
-            else
-            {
-
+
+
-
-                GeoStatsAttachmentPtr st =
@@ -692 +710 @@
-            }
-        }
-
-
-
-
-
-
-
-
-
-
+
+
-    }
-}

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

@@ -48 +48 @@
-
-#include <map>
+#include <queue>
-
-#include "OSGHashSorter.h"
@@ -176 +177 @@
-    void drawNode(RenderTreeNode *pNode, DrawEnv &denv, RenderPartition *part);
-    void drawTestNode(RenderTreeNode *pNode, DrawEnv &denv, RenderPartition *part);
-RenderTreeNode *pNode, 
+
-
-    inline void enterTesting(DrawEnv &denv, RenderPartition *part);
@@ -213 +214 @@
-
-    GLuint* _testSamples;
+    UInt32  _numTestSamples;
-    bool    _isOccSetup;
-    UInt32  _currSample; //!< Last current sample test number
+    //UInt32  _currSampleBack; //!< Last number we can test to
+    UInt32  _testedNodes; //!< Number of OC tested nodes
-    bool    _inTesting;  //!< Whether in testing mode or not
-    
@@ -227 +231 @@
-   
-    std::vector<RenderTreeNode*> _testNodes; //!< Nodes currently being tested
+    std::queue<RenderTreeNode*> _testPendingNodes; //!< Nodes with tests pending
-
-    //-----------------------------------------------------------------------
@@ -239 +244 @@
-    UInt32                 _visPixelThreshold;
-    Real32                 _coveredProbThreshold;
+    //Real32                 _screenPercent;
-
-    //-----------------------------------------------------------------------