Changeset 88 for trunk/VUT/work/ogre_changes/RenderSystem/GL

Timestamp:

05/09/05 22:55:21 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/work/ogre_changes/RenderSystem/GL

Files:

• include/OgreGLHardwareOcclusionQuery.h (modified) (1 diff)
• src/OgreGLHardwareOcclusionQuery.cpp (modified) (2 diffs)

trunk/VUT/work/ogre_changes/RenderSystem/GL/include/OgreGLHardwareOcclusionQuery.h

@@ -88 +88 @@
         void beginOcclusionQuery();
         void endOcclusionQuery();
-        bool pullOcclusionQuery( unsigned int* NumOfFragments);
-        bool pullOcclusionQuery( unsigned int* NumOfFragments, const HW_OCCLUSIONQUERY flag  ); 
-#ifdef GTP_VISIBILITY_MODIFIED_OGRE
-        bool resultAvailable();
-#endif
+        bool pullOcclusionQuery( unsigned int* NumOfFragments, const bool waitForResult );
+        bool pullOcclusionQuery( unsigned int* NumOfFragments, const bool waitForResult,
+                                                         const HW_OCCLUSIONQUERY flag  ); 
+
         unsigned int getLastQuerysPixelcount() { return m_uintPixelCount; }
 

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

@@ -95 +95 @@
         if( m_bHWOcclusionSupport )     // Make it fail silently if hardware occlusion isn't supported
         {
-                //if  ( m_SkipCounter ==  m_Skip ) { m_SkipCounter = 0; };              // Counter starts at 0 again at m_Skip 
-                //if ( m_SkipCounter == 0 && m_uintPixelCount != 0 ) // New or none visable objects must allways be tested but visable objects can be skiped
-                //{
-                        glBeginOcclusionQueryNV_ptr( m_uintQuery[0] );
-                //}
+                glBeginOcclusionQueryNV_ptr( m_uintQuery[0] );
         }
 }
@@ -107 +103 @@
         if( m_bHWOcclusionSupport )     // Make it fail silently if hardware occlusion isn't supported
         {
-                //if( m_SkipCounter == 0 && m_uintPixelCount != 0 ) // New or none visable objects must allways be tested but visable objects can be skiped
-                //{
-                        glEndOcclusionQueryNV_ptr();
-                //}
-                //m_SkipCounter++;
+                glEndOcclusionQueryNV_ptr();
         }
 }
 
-bool GLHardwareOcclusionQuery::pullOcclusionQuery( unsigned int * NumOfFragments) 
+bool GLHardwareOcclusionQuery::pullOcclusionQuery( unsigned int * NumOfFragments, const bool waitForResult) 
 {
-        if( m_bHWOcclusionSupport )     // Make it fail silently if hardware occlusion isn't supported
+        unsigned int isAvailable = GL_TRUE;
+
+        if( m_bHWOcclusionSupport )     
         {
-                glGetOcclusionQueryuivNV_ptr( m_uintQuery[0], GL_PIXEL_COUNT_NV, NumOfFragments );
+                if(!waitForResult)
+                {
+                        glGetOcclusionQueryuivNV_ptr( m_uintQuery[0], GL_PIXEL_COUNT_AVAILABLE_NV, &isAvailable );
+                }
+
+                if(isAvailable == GL_TRUE)
+                {
+                        glGetOcclusionQueryuivNV_ptr( m_uintQuery[0], GL_PIXEL_COUNT_NV, NumOfFragments );
+                }
         } 
         else
         {
-                *NumOfFragments = 100000;               // Fails quitlly -> every object tested is visable.
+                // In case hardware occlusion isn't supported, every object is set visible.
+                *NumOfFragments = 100000;               
         }
 
         m_uintPixelCount = *NumOfFragments; 
 
-        return true;
+        return isAvailable == GL_TRUE;  
 }
 
 //------------------------------------------------------------------
-// OpenGL dosn't use the flag, but to fulfil the abstract interface we need to include this function.
+// OpenGL doesn't use the flag, but to implement the abstract interface we need to include this function.
 // Using this function in OpenGL mode simple works the same way as calling the other function without the flag parameter,
 // but in DX9 it works differentlly, see notes in the DX9 implementation.
 //--
-bool GLHardwareOcclusionQuery::pullOcclusionQuery( unsigned int* NumOfFragments, const HW_OCCLUSIONQUERY flag  ) 
+bool GLHardwareOcclusionQuery::pullOcclusionQuery( unsigned int* NumOfFragments, const bool waitForResult, const HW_OCCLUSIONQUERY flag  ) 
 {
-        if( m_bHWOcclusionSupport )     // Make it fail silently if hardware occlusion isn't supported
-        {
-                glGetOcclusionQueryuivNV_ptr( m_uintQuery[0], GL_PIXEL_COUNT_NV, NumOfFragments );
-        }
-        else
-        {
-                *NumOfFragments = 100000;               // Fails quitlly -> every object tested is visable.
-        }
-
-        m_uintPixelCount = *NumOfFragments; 
-        
-        return true;
+        return pullOcclusionQuery(NumOfFragments, waitForResult);
 }
 
-#ifdef GTP_VISIBILITY_MODIFIED_OGRE
-bool GLHardwareOcclusionQuery::resultAvailable()
-{
-        unsigned int result = GL_TRUE;
-
-        if( m_bHWOcclusionSupport )     // Make it fail silently if hardware occlusion isn't supported
-        {
-                glGetOcclusionQueryuivNV_ptr( m_uintQuery[0], GL_PIXEL_COUNT_NV, &result );
-        }
-
-        return result == GL_TRUE;
-}
-#endif
 }