Changeset 343 for trunk/VUT/work/ogre_changes/RenderSystems/GL/src

Timestamp:

10/20/05 18:49:11 (19 years ago)

Author:

mattausch

Message:

added switch between NV and ARB queries in the render system and in the demos.
Fixed render queue bug: when clearing queue, we traversed through all priority groups
to clear the passmaps. This became very slow because had to traverse many elements (over 1000
for city demo). Now all we destroy the priority groups for each rendering (per hierarchy node).

Location:

trunk/VUT/work/ogre_changes/RenderSystems/GL/src

Files:

• OgreGLHardwareOcclusionQuery.cpp (modified) (5 diffs)
• OgreGLRenderSystem.cpp (modified) (1 diff)

trunk/VUT/work/ogre_changes/RenderSystems/GL/src/OgreGLHardwareOcclusionQuery.cpp

@@ -29 +29 @@
 namespace Ogre {
 
+bool GLHardwareOcclusionQuery::sUseArbQueries = false;
 /**
   * This is a class that is the base class of the query class for 
@@ -51 +52 @@
         // Check for hardware occlusion support
         // This is a hack to see if hw occlusion is supported. pointer is 0 if it's not supported.
-#ifdef GTP_VISIBILITY_USE_ARB_QUERIES
-        if (glGenQueriesARB_ptr != 0)
-#else
-        if (glGenOcclusionQueriesNV_ptr != 0)
-#endif
-    {
-                mHasOcclusionSupport = true;
-        }
-        else
-        {
-                mHasOcclusionSupport = false;
-        }
+        mHasOcclusionSupportARB = (glGenQueriesARB_ptr != 0);
+        mHasOcclusionSupportNV = (glGenOcclusionQueriesNV_ptr != 0);
 
-        if(mHasOcclusionSupport)
-        {
-#ifdef GTP_VISIBILITY_USE_ARB_QUERIES
+        if (sUseArbQueries && mHasOcclusionSupportARB)
                 glGenQueriesARB_ptr(1, &mQueryID );     
-#else
+        else if (!sUseArbQueries && mHasOcclusionSupportNV)
                 glGenOcclusionQueriesNV_ptr(1, &mQueryID);
-#endif
-        }
 }
 
@@ -79 +66 @@
 GLHardwareOcclusionQuery::~GLHardwareOcclusionQuery() 
 { 
-        if( mHasOcclusionSupport )
-        {
-#ifdef GTP_VISIBILITY_USE_ARB_QUERIES
+        if (sUseArbQueries && mHasOcclusionSupportARB)
                 glDeleteQueriesARB_ptr(1, &mQueryID);
-#else
+        else if (!sUseArbQueries && mHasOcclusionSupportNV)
                 glDeleteOcclusionQueriesNV_ptr(1, &mQueryID);  
-#endif
-        }       
 }
 
@@ -94 +77 @@
 void GLHardwareOcclusionQuery::beginOcclusionQuery() 
 { 
-        // Make it fail silently if hardware occlusion isn't supported
-        if(mHasOcclusionSupport)
-        {
-                // Counter starts at 0 again at mSkipInterval 
-#ifndef GTP_VISIBILITY_MODIFIED_OGRE
-                if(mSkipCounter == mSkipInterval) 
-#else
-                if (mSkipCounter >= mSkipInterval)  // otherwise no query ever issued if mSkipInterval = 0 !
-#endif // GTP_VISIBILITY_MODIFIED_OGRE
-        {
-                        mSkipCounter = 0; 
-                }
+        //if (mSkipCounter >= mSkipInterval)  // otherwise no query ever issued if mSkipInterval = 0 !
+        //      mSkipCounter = 0; if (mSkipCounter != 0) return;
 
-                if (mSkipCounter == 0)
-                {
-#ifdef GTP_VISIBILITY_USE_ARB_QUERIES
+        if (sUseArbQueries && mHasOcclusionSupportARB)
                         glBeginQueryARB_ptr(GL_SAMPLES_PASSED_ARB, mQueryID);
-#else
+        else if (!sUseArbQueries && mHasOcclusionSupportNV)
                         glBeginOcclusionQueryNV_ptr(mQueryID);
-#endif
-                }
-        }
 }
         
 void GLHardwareOcclusionQuery::endOcclusionQuery() 
 { 
-        // Make it fail silently if hardware occlusion isn't supported
-        if(mHasOcclusionSupport)
-        {
-                if( mSkipCounter == 0)
-                {
-#ifdef GTP_VISIBILITY_USE_ARB_QUERIES
+        //if( mSkipCounter != 0) return;
+        if (sUseArbQueries && mHasOcclusionSupportARB)
                         glEndQueryARB_ptr(GL_SAMPLES_PASSED_ARB);
-#else
+        else if (!sUseArbQueries && mHasOcclusionSupportNV)
                         glEndOcclusionQueryNV_ptr();
-#endif
+//      mSkipCounter++;
                 }
 
-                mSkipCounter++;
-        } 
-}
-
-//------------------------------------------------------------------
-// OpenGL dosn't use the flag paramter.
-//------------------------------------------------------------------
 bool GLHardwareOcclusionQuery::pullOcclusionQuery( unsigned int* NumOfFragments, const HW_OCCLUSIONQUERY flag  ) 
 {
-        if( mHasOcclusionSupport )      // Make it fail silently if hardware occlusion isn't supported
-        {
-#ifdef GTP_VISIBILITY_USE_ARB_QUERIES
+        if (sUseArbQueries && mHasOcclusionSupportARB)
                 glGetQueryObjectuivARB_ptr(mQueryID, GL_QUERY_RESULT_ARB, NumOfFragments);
-#else
+        else if (!sUseArbQueries && mHasOcclusionSupportNV)
 glGetOcclusionQueryuivNV_ptr(mQueryID, GL_PIXEL_COUNT_NV, NumOfFragments);
-#endif
-        }
         else
-        {
-                *NumOfFragments = 100000;               // Fails quitlly -> every object tested is visable.
-        }
+                *NumOfFragments = 100000;               // Fails quietly
 
         mPixelCount = *NumOfFragments; 
@@ -161 +112 @@
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
         //------------------------------------------------------------------
-        bool GLHardwareOcclusionQuery::pullOcclusionQuery( unsigned int * NumOfFragments, const bool waitForResult, const HW_OCCLUSIONQUERY flag) 
+bool GLHardwareOcclusionQuery::pullOcclusionQuery(unsigned int * NumOfFragments, 
+                                                                                                  const bool waitForResult, 
+                                                                                                  const HW_OCCLUSIONQUERY flag) 
 {
-        unsigned int isAvailable = GL_TRUE;
+        if (sUseArbQueries && mHasOcclusionSupportARB)  
+        {
+                int isAvailable = GL_TRUE;
 
-                if (mHasOcclusionSupport)       
-        {
                 if (!waitForResult)
+                        glGetQueryivARB_ptr(mQueryID, GL_QUERY_RESULT_AVAILABLE_ARB, &isAvailable);
+                
+                if (isAvailable == GL_TRUE)
+                        glGetQueryObjectuivARB_ptr(mQueryID, GL_QUERY_RESULT_ARB, NumOfFragments);
+
+                mPixelCount = *NumOfFragments;
+
+                return isAvailable == GL_TRUE;
+        } 
+        else if (!sUseArbQueries && mHasOcclusionSupportNV)
                 {
-                        // use nv queries rather that arb because they are faster (no flush)
-                                //glGetQueryivARB_ptr(mQueryID, GL_QUERY_RESULT_AVAILABLE_ARB, &isAvailable);
+                unsigned int isAvailable = GL_TRUE;
+
+                if (!waitForResult)
                                 glGetOcclusionQueryuivNV_ptr(mQueryID, GL_PIXEL_COUNT_AVAILABLE_NV, &isAvailable);
-                }
 
                 if (isAvailable == GL_TRUE)
-                {
-                                //glGetQueryObjectuivARB_ptr(mQueryID, GL_QUERY_RESULT_ARB, NumOfFragments);
                                 glGetOcclusionQueryuivNV_ptr(mQueryID, GL_PIXEL_COUNT_NV, NumOfFragments);
-                }
-        } 
-        else
-        {
-                // In case hardware occlusion isn't supported, every object is set visible.
-                *NumOfFragments = 100000;               
-        }
 
                 mPixelCount = *NumOfFragments; 
 
-        return isAvailable == GL_TRUE;  
+                return isAvailable == GL_TRUE;
+                }
+        
+                // In case hardware occlusion isn't supported, every object is set visible.
+                *NumOfFragments = 100000;               
+                mPixelCount = *NumOfFragments; 
+
+        return GL_TRUE; 
 }
 

trunk/VUT/work/ogre_changes/RenderSystems/GL/src/OgreGLRenderSystem.cpp

@@ -281 +281 @@
     void GLRenderSystem::setConfigOption(const String &name, const String &value)
     {
+                // set occlusion query
+#ifdef GTP_VISIBILITY_MODIFIED_OGRE
+                if ( name == "ArbQueries" )
+                {
+                        if ( value == "No" )
+                        {
+                                GLHardwareOcclusionQuery::sUseArbQueries = false;
+                        }
+                        else if  ( value == "Yes" )
+                        {
+                                GLHardwareOcclusionQuery::sUseArbQueries = true;
+                        }
+                        return;
+                }
+#endif
+
         mGLSupport->setConfigOption(name, value);
     }