Changeset 2663 for GTP/trunk/Lib/Vis/Preprocessing/src/OcclusionQuery.cpp

Timestamp:

04/29/08 11:19:06 (16 years ago)

Author:

mattausch

Message:

debugging vp evaluation

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/OcclusionQuery.cpp (modified) (11 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/OcclusionQuery.cpp

@@ -12 +12 @@
 #endif
 
-#ifdef _WIN32
+//#ifdef _WIN32
 // This Macro does not compile under LINUX
-#define _ARBGL
-#endif
+//#define _ARBGL
+//#endif
+
 
 using namespace std;
 
-namespace GtpVisibilityPreprocessor {
-
-bool OcclusionQuery::sUseArbQueries = true;
+namespace GtpVisibilityPreprocessor 
+{
+
+const static bool sUseArbQueries = true;
 
 
@@ -27 +29 @@
 {
         GLuint id;
-
-        if (sUseArbQueries)
-        {
-#ifdef _ARBGL
-          // VH
-          glGenQueriesARB(1, &id);
+        
+        if (sUseArbQueries)
+        {
+#ifdef _WIN32
+                // VH
+                glGenQueriesARB(1, &id);
 #endif
         }
         else
         {               
-#ifdef _ARBGL
-          // VH
+#ifdef _WIN32
+                // VH
                 glGenOcclusionQueriesNV(1, &id);
 #endif
         }
 }
+
 
 OcclusionQuery::OcclusionQuery(const unsigned int idx):
 mId(idx)
-{}
+{
+}
 
 
@@ -53 +57 @@
         if (sUseArbQueries)
         {
-#ifdef _ARBGL
-          // VH
+#ifdef _WIN32
+                // VH
                 glDeleteQueriesARB(1, &mId);
 #endif
@@ -60 +64 @@
         else
         {
-#ifdef _ARBGL
-          // VH
+#ifdef _WIN32
+                // VH
                 glDeleteOcclusionQueriesNV(1, &mId);
 #endif
@@ -67 +71 @@
         
 }
-//-----------------------------------------------------------------------
+
+
 void OcclusionQuery::BeginQuery()
 {
         if (sUseArbQueries)
         {
-#ifdef _ARBGL
-          // VH
+#ifdef _WIN32
+                // VH
+                cout << "issuing arb query" << endl;
                 glBeginQueryARB(GL_SAMPLES_PASSED_ARB, mId);
 #endif
@@ -79 +85 @@
         else
         {
-#ifdef _ARBGL
-          // VH
+#ifdef _WIN32
+                // VH
+                cout << "issuing nv query" << endl;
                 glBeginOcclusionQueryNV(mId);
 #endif
         }
 }
-//-----------------------------------------------------------------------
+
+
 void OcclusionQuery::EndQuery()
 {
         if (sUseArbQueries)
         {
-#ifdef _ARBGL
-          // VH
+#ifdef _WIN32
+                // VH
+                cout << "ending query" << endl;
                 glEndQueryARB(GL_SAMPLES_PASSED_ARB);
 #endif
@@ -97 +106 @@
         else
         {
-#ifdef _ARBGL
-          // VH
+#ifdef _WIN32
+                // VH
                 glEndOcclusionQueryNV();        
 #endif
@@ -110 +119 @@
 }
 
+
 bool OcclusionQuery::ResultAvailable() const
 {
-        GLuint available;
-
-        if (sUseArbQueries)
-        {
-#ifdef _ARBGL
-          // VH
-                //GLint available;
-                glGetQueryObjectuivARB(mId,
-                                                           GL_QUERY_RESULT_AVAILABLE_ARB,
-                                       &available);
+        GLuint available = GL_TRUE;
+
+        if (sUseArbQueries)
+        {
+#ifdef _WIN32
+                // VH
+                glGetQueryObjectuivARB(mId, GL_QUERY_RESULT_AVAILABLE_ARB, &available);
 #endif          
-                return available == GL_TRUE;
-        }
-        else
-        {
-#ifdef _ARBGL
+        }
+        else
+        {
+#ifdef _WIN32
           // VH
           glGetOcclusionQueryuivNV(mId, GL_PIXEL_COUNT_AVAILABLE_NV, &available);
 #endif
-                return available == GL_TRUE;
-        }
-
+        }
+
+        return available == GL_TRUE;
 }
 
@@ -139 +145 @@
 unsigned int OcclusionQuery::GetQueryResult() const
 {
-        GLuint sampleCount;
-
-        if (sUseArbQueries)
-        {
-#ifdef _ARBGL
-          // VH
+        GLuint sampleCount = 1;
+
+        if (sUseArbQueries)
+        {
+#ifdef _WIN32
+                // VH
                 glGetQueryObjectuivARB(mId, GL_QUERY_RESULT_ARB, &sampleCount);
 #endif
-                return sampleCount;
         }
         else
         {       
-#ifdef _ARBGL
-          // VH
+#ifdef _WIN32
+                // VH
                 glGetOcclusionQueryuivNV(mId, GL_PIXEL_COUNT_NV, &sampleCount);
 #endif          
-                return sampleCount;
         }       
-}
-
-
-void OcclusionQuery::GenQueries(std::vector<OcclusionQuery * > &queries, const int numQueries)
+        
+        return sampleCount;
+}
+
+
+void OcclusionQuery::GenQueries(std::vector<OcclusionQuery * > &queries, 
+                                                                int numQueries)
 {
         if ((int)queries.size() < numQueries)
@@ -170 +177 @@
                 if (sUseArbQueries)
                 {
-#ifdef _ARBGL
-          // VH
+#ifdef _WIN32
+                        // VH
                         glGenQueriesARB(n, (unsigned int *)newQueries);
+                        cout << "creating " << n << " arb queries" <<  endl;
 #endif
                 }
                 else
                 {
-#ifdef _ARBGL
-          // VH           
-                  glGenOcclusionQueriesNV(n, (unsigned int *)newQueries);
+#ifdef _WIN32
+                        // VH             
+                        glGenOcclusionQueriesNV(n, (unsigned int *)newQueries);
+                        cout << "creating " << n << " nv queries" <<  endl;
 #endif            
                 }
@@ -192 +201 @@
         }
 }
+
+
 } // namespace