Changeset 97 for trunk/VUT/work/ogre_changes/RenderSystems/Direct3D9

Timestamp:

05/13/05 15:14:12 (20 years ago)

Author:

mattausch

Message:

ogre: changed from occlusion_query_nv to occlusion_query_arb (in ogre_changes)

File:

• trunk/VUT/work/ogre_changes/RenderSystems/Direct3D9/src/OgreD3D9HardwareOcclusionQuery.cpp (modified) (6 diffs)

trunk/VUT/work/ogre_changes/RenderSystems/Direct3D9/src/OgreD3D9HardwareOcclusionQuery.cpp

@@ -71 +71 @@
 }
 
+#ifndef GTP_VISIBILITY_MODIFIED_OGRE
 //------------------------------------------------------------------
 // Occlusion query functions (see base class documentation for this)
@@ -78 +79 @@
         if( m_bHWOcclusionSupport )             // Make it fail silently if hardware occlusion isn't supported
         {
-                m_pD3DQuery->Issue(D3DISSUE_BEGIN); 
-        }
-}
-//------------------------------------------------------------------
+                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
+                {
+                        m_pD3DQuery->Issue(D3DISSUE_BEGIN); 
+                }
+        }
+}
+        
 void D3D9HardwareOcclusionQuery::endOcclusionQuery() 
 { 
         if( m_bHWOcclusionSupport )     // Make it fail silently if hardware occlusion isn't supported
         {
-                m_pD3DQuery->Issue(D3DISSUE_END); 
+                if (m_SkipCounter == 0 && m_uintPixelCount != 0 ) // New or none visable objects must allways be tested but visable objects can be skiped
+                {
+                        m_pD3DQuery->Issue(D3DISSUE_END); 
+                }
+                m_SkipCounter++;                                                                 // The skip counter is increased 
         }
 }
@@ -95 +105 @@
 // Note: OpenGL dosn't use this flag at all so the application running OpenGL won't display any different behaviour.
 //--
-bool D3D9HardwareOcclusionQuery::pullOcclusionQuery( unsigned int* NumOfFragments, const bool waitForResult ) 
-{
-        return pullOcclusionQuery(NumOfFragments, waitForResult, HWOCCLUSIONQUERY_FLUSH);
+bool D3D9HardwareOcclusionQuery::pullOcclusionQuery( unsigned int* NumOfFragments) 
+{
+        HRESULT hr;
+        
+        if( m_bHWOcclusionSupport )     // Make it fail silently if hardware occlusion isn't supported
+        {
+                hr = m_pD3DQuery->GetData( NumOfFragments, sizeof( NumOfFragments ), D3DGETDATA_FLUSH );
+
+                if ( hr != S_OK ) 
+                        {
+                                return false; 
+                        }
+                        else 
+                        { 
+                                m_uintPixelCount = *NumOfFragments; 
+                                return true; 
+                        }
+        }
+        else
+        {
+                m_uintPixelCount = 100000; // Fails quitlly if hardware occlusion is not supported - every object is visable
+                return true;
+        }
 }
 
@@ -106 +136 @@
 // Note: OpenGL dosn't use this flag at all so the application running OpenGL won't display any different behaviour.
 //--
+bool D3D9HardwareOcclusionQuery::pullOcclusionQuery( unsigned int* NumOfFragments, const HW_OCCLUSIONQUERY flag  ) 
+{
+        HRESULT hr;
+
+        // TO DO: USE lockOpts= D3D9Mappings::get(options); instead of RS_OCCLUSIONQUERY enum
+
+        if( m_bHWOcclusionSupport )     // Make it fail silently if hardware occlusion isn't supported
+        {
+        
+                switch( flag )
+                {
+                        case HWOCCLUSIONQUERY_FLUSH :   
+                                hr = m_pD3DQuery->GetData( NumOfFragments, sizeof( NumOfFragments ), D3DGETDATA_FLUSH );
+                        break;
+
+                        case HWOCCLUSIONQUERY_NOFLUSH : 
+                                hr = m_pD3DQuery->GetData( NumOfFragments, sizeof( NumOfFragments ), 0 );
+                        break;
+                };
+
+
+
+                if ( hr != S_OK ) 
+                        {
+                                return false; 
+                        }
+                        else 
+                        { 
+                                m_uintPixelCount = *NumOfFragments; 
+                                return true; 
+                        }
+        }
+        else 
+        {
+                m_uintPixelCount = 100000; // Fails quitlly if hardware occlusion is not supported - every object is visable
+                return true;
+        }
+}
+#else // GTP_VISIBILITY_MODIFIED_OGRE
+//------------------------------------------------------------------
+void D3D9HardwareOcclusionQuery::beginOcclusionQuery() 
+{ 
+        if( m_bHWOcclusionSupport )             // Make it fail silently if hardware occlusion isn't supported
+        {
+                m_pD3DQuery->Issue(D3DISSUE_BEGIN); 
+        }
+}
+//------------------------------------------------------------------
+void D3D9HardwareOcclusionQuery::endOcclusionQuery() 
+{ 
+        if( m_bHWOcclusionSupport )     // Make it fail silently if hardware occlusion isn't supported
+        {
+                m_pD3DQuery->Issue(D3DISSUE_END); 
+        }
+}
+//------------------------------------------------------------------
+bool D3D9HardwareOcclusionQuery::pullOcclusionQuery( unsigned int* NumOfFragments, const bool waitForResult ) 
+{
+        return pullOcclusionQuery(NumOfFragments, waitForResult, HWOCCLUSIONQUERY_FLUSH);
+}
+
+//------------------------------------------------------------------
 bool D3D9HardwareOcclusionQuery::pullOcclusionQuery( unsigned int* NumOfFragments, const bool waitForResult, 
                                                                                                      const HW_OCCLUSIONQUERY flag  ) 
@@ -114 +206 @@
         return pullOcclusionQuery(NumOfFragments, waitForResult, queryFlag);
 }
+
 //------------------------------------------------------------------
 bool D3D9HardwareOcclusionQuery::pullOcclusionQuery( unsigned int* NumOfFragments, const bool waitForResult, 
@@ -137 +230 @@
         return hr == S_OK;
 }
+
+
+#endif // GTP_VISIBILITY_MODIFIED_OGRE
+
 } // namespace OGre