Changeset 2877 for trunk/packages/vizservers/nanovis/PerfQuery.h

Timestamp:

Mar 23, 2012, 1:31:05 AM (13 years ago)

Author:

ldelgass

Message:

Some minor refactoring, also add some more fine grained config.h defines
(e.g. replace NV40 define with feature defines). Add tests for some required
OpenGL extensions (should always check for extensions or base version before
calling entry points from the extension). Also, clamp diffuse and specular
values on input and warn when they are out of range.

File:

• trunk/packages/vizservers/nanovis/PerfQuery.h (modified) (2 diffs)

trunk/packages/vizservers/nanovis/PerfQuery.h

@@ -16 +16 @@
  * ======================================================================
  */
-#ifndef _PERFQUERY_H_
-#define _PERFQUERY_H_
+#ifndef PERFQUERY_H
+#define PERFQUERY_H
 
 #include <stdio.h>
@@ -25 +25 @@
 #include "Trace.h"
 
-//check if occlusion query is supported
-inline bool check_query_support()
-{
-    int bitsSupported = -1;
-    glGetQueryivARB(GL_SAMPLES_PASSED_ARB, GL_QUERY_COUNTER_BITS_ARB, 
-                    &bitsSupported);
-    if (bitsSupported == 0) {
-        TRACE("occlusion query not supported!\n");
-        return false;
-    } else {
-        TRACE("Occlusion query with %d bits supported\n", bitsSupported);
-        return true;
-    }
-}
-
 class PerfQuery
 {
 public:
-    GLuint id;
-    int pixel;
-    
     PerfQuery();
     ~PerfQuery();
-    
+
     void enable();      //start counting how many pixels are rendered
     void disable();     //stop counting
 
     void reset()
-    { 
-        pixel = 0; 
+    {
+        pixel = 0; 
     }
 
-    int get_pixel_count()
+    int getPixelCount()
     {
-        return pixel;           //return current pixel count
+        return pixel;           //return current pixel count
     }
+
+    static bool checkQuerySupport();
+
+    GLuint id;
+    int pixel;
 };
 
+//check if occlusion query is supported
+inline bool PerfQuery::checkQuerySupport()
+{
+    if (!GLEW_ARB_occlusion_query) {
+        TRACE("ARB_occlusion_query extension not supported\n");
+        return false;
+    }
+    int bitsSupported = -1;
+    glGetQueryivARB(GL_SAMPLES_PASSED_ARB, GL_QUERY_COUNTER_BITS_ARB, 
+                    &bitsSupported);
+    if (bitsSupported == 0) {
+        TRACE("occlusion query not supported!\n");
+        return false;
+    } else {
+        TRACE("Occlusion query with %d bits supported\n", bitsSupported);
+        return true;
+    }
+}
 #endif