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

Timestamp:

01/03/08 15:53:44 (17 years ago)

Author:

bittner

Message:

big merge: preparation for havran ray caster, check if everything works

File:

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

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

@@ -1 +1 @@
 #include "OcclusionQuery.h"
 #include <iostream>
+
+
+#ifdef _WIN32
 #include <glInterface.h>
-
+#else
+#include <GL/gl.h>
+#include <GL/glu.h>
+//#include <GL/glxext.h>
+#include <SDL/SDL_opengl.h>
+#endif
 
 using namespace std;
@@ -17 +25 @@
         if (sUseArbQueries)
         {
-                glGenQueriesARB(1, &id);
+#ifdef _ARBGL
+          // VH
+          glGenQueriesARB(1, &id);
+#endif
         }
         else
         {               
+#ifdef _ARBGL
+          // VH
                 glGenOcclusionQueriesNV(1, &id);
+#endif
         }
 }
@@ -34 +48 @@
         if (sUseArbQueries)
         {
+#ifdef _ARBGL
+          // VH
                 glDeleteQueriesARB(1, &mId);
+#endif
         }
         else
         {
+#ifdef _ARBGL
+          // VH
                 glDeleteOcclusionQueriesNV(1, &mId);
+#endif
         }
         
@@ -47 +67 @@
         if (sUseArbQueries)
         {
+#ifdef _ARBGL
+          // VH
                 glBeginQueryARB(GL_SAMPLES_PASSED_ARB, mId);
+#endif
         }
         else
         {
+#ifdef _ARBGL
+          // VH
                 glBeginOcclusionQueryNV(mId);
+#endif
         }
 }
@@ -59 +85 @@
         if (sUseArbQueries)
         {
+#ifdef _ARBGL
+          // VH
                 glEndQueryARB(GL_SAMPLES_PASSED_ARB);
+#endif
         }
         else
         {
+#ifdef _ARBGL
+          // VH
                 glEndOcclusionQueryNV();        
+#endif
         }
 }
@@ -79 +111 @@
         if (sUseArbQueries)
         {
+#ifdef _ARBGL
+          // VH
                 //GLint available;
                 glGetQueryObjectuivARB(mId,
                                                            GL_QUERY_RESULT_AVAILABLE_ARB,
-                               &available);
+                                       &available);
+#endif          
                 return available == GL_TRUE;
         }
         else
         {
-                
-                glGetOcclusionQueryuivNV(mId, GL_PIXEL_COUNT_AVAILABLE_NV, &available);
-
+#ifdef _ARBGL
+          // VH
+          glGetOcclusionQueryuivNV(mId, GL_PIXEL_COUNT_AVAILABLE_NV, &available);
+#endif
                 return available == GL_TRUE;
         }
@@ -102 +138 @@
         if (sUseArbQueries)
         {
+#ifdef _ARBGL
+          // VH
                 glGetQueryObjectuivARB(mId, GL_QUERY_RESULT_ARB, &sampleCount);
+#endif
                 return sampleCount;
         }
         else
         {       
-
+#ifdef _ARBGL
+          // VH
                 glGetOcclusionQueryuivNV(mId, GL_PIXEL_COUNT_NV, &sampleCount);
+#endif          
                 return sampleCount;
         }       
@@ -124 +165 @@
                 if (sUseArbQueries)
                 {
+#ifdef _ARBGL
+          // VH
                         glGenQueriesARB(n, (unsigned int *)newQueries);
+#endif
                 }
                 else
                 {
-                        glGenOcclusionQueriesNV(n, (unsigned int *)newQueries);
+#ifdef _ARBGL
+          // VH           
+                  glGenOcclusionQueriesNV(n, (unsigned int *)newQueries);
+#endif            
                 }