Changeset 377

Timestamp:

Mar 25, 2006, 12:37:21 PM (19 years ago)

Author:

qiaow

Message:

Added PerfQuery? class for tracking number of pixels rendered on screen

Location:

trunk/gui/vizservers/nanovis

Files:

• Makefile (modified) (2 diffs)
• PerfQuery.cpp (added)
• PerfQuery.h (added)
• global.h (modified) (1 diff)
• nanovis.cpp (modified) (6 diffs)
• nanovis.h (modified) (1 diff)
• shaders/one_volume.cg (modified) (2 diffs)

trunk/gui/vizservers/nanovis/Makefile

@@ -1 +1 @@
 OBJ_NANOVIS = nanovis.o Socket.o RenderVertexArray.o Plane.o ConvexPolygon.o Vector4.o Vector3.o Mat4x4.o \
-                Texture1D.o Texture3D.o ColorMap.o Volume.o Texture2D.o ParticleSystem.o Sphere.o Color.o
+                Texture1D.o Texture3D.o ColorMap.o Volume.o Texture2D.o ParticleSystem.o Sphere.o Color.o \
+                PerfQuery.o
 
 AUXSRC = config.h define.h global.h
@@ -67 +68 @@
         gcc $(CFLAG) ConvexPolygon.cpp
 
+PerfQuery.o: PerfQuery.cpp
+        gcc $(CFLAG) PerfQuery.cpp
+
 nanovis.o: nanovis.h nanovis.cpp ParticleSystem.o $(AUXSRC)
         gcc $(CFLAG) nanovis.cpp

trunk/gui/vizservers/nanovis/global.h

@@ -56 +56 @@
 }
 
+
+//query opengl information
+static void system_info(){
+  fprintf(stderr, "-----------------------------------------------------------\n");
+  fprintf(stderr, "OpenGL driver: %s %s\n", glGetString(GL_VENDOR), glGetString(GL_VERSION));
+  fprintf(stderr, "Graphics hardware: %s\n", glGetString(GL_RENDERER));
+  fprintf(stderr, "-----------------------------------------------------------\n");
+}
+
+
 #endif

trunk/gui/vizservers/nanovis/nanovis.cpp

@@ -38 +38 @@
 ColorMap* colormap[MAX_N_VOLUMES];      //transfer functions, currently handle up to 10 colormaps
 
+PerfQuery* perf;                        //perfromance counter
 
 //Nvidia CG shaders and their parameters
@@ -633 +634 @@
 void initGL(void) 
 { 
+   system_info();
    init_glew();
 
@@ -667 +669 @@
    }
 
-   //init_vector_field();       //3d vector field
-   load_volume_file(0, "./data/A-apbs-2-out-potential-PE0.dx");
+   //check if performance query is supported
+   if(check_query_support()){
+     //create queries to count number of rendered pixels
+     perf = new PerfQuery(); 
+   }
+
+   init_vector_field(); //3d vector field
+   //load_volume_file(0, "./data/A-apbs-2-out-potential-PE0.dx");
    //load_volume_file(0, "./data/nw-AB-Vg=0.000-Vd=1.000-potential.dx");
    //load_volume_file(0, "./data/test2.dx");
@@ -1287 +1295 @@
 
   get_near_far_z(mv, zNear, zFar);
-  fprintf(stderr, "zNear:%f, zFar:%f\n", zNear, zFar);
-  fflush(stderr);
+  //fprintf(stderr, "zNear:%f, zFar:%f\n", zNear, zFar);
+  //fflush(stderr);
 
   //compute actual rendering slices
   float z_step = fabs(zNear-zFar)/n_slices;             
   int n_actual_slices = (int)(fabs(zNear-zFar)/z_step + 1);
-  fprintf(stderr, "slices: %d\n", n_actual_slices);
-  fflush(stderr);
+  //fprintf(stderr, "slices: %d\n", n_actual_slices);
+  //fflush(stderr);
 
   static ConvexPolygon staticPoly;      
@@ -1559 +1567 @@
    //psys->display_vertices();
 
-   //render volume
+   //render multiple volumes
    //volume[0]->location =Vector3(0.,0.,0.);
    //render_volume(0, 256);
@@ -1565 +1573 @@
    //render another but shifted using the same texture
    volume[0]->location =Vector3(-0.5,-0.5,-0.5);
+
+   perf->enable();
    render_volume(0, 256);
+   perf->disable();
+   fprintf(stderr, "pixels: %d\n", perf->get_pixel_count());
+   perf->reset();
 
    glDisable(GL_DEPTH_TEST);

trunk/gui/vizservers/nanovis/nanovis.h

@@ -40 +40 @@
 #include "Volume.h"
 #include "ParticleSystem.h"
+#include "PerfQuery.h"
 
 #include "config.h"

trunk/gui/vizservers/nanovis/shaders/one_volume.cg

@@ -25 +25 @@
   float4 tex_coord = mul(modelViewInv, IN.TexCoord);
         
-#if 1
+#if 0
   //1 component
   float sample = tex3D(volume, tex_coord.xyz);
@@ -37 +37 @@
 
 
-#if 0
+#if 1
   //3 component
   float3 sample = tex3D(volume, tex_coord.xyz).xyz;