Changeset 3875 for trunk/packages/vizservers/nanovis/nanovis.cpp

Timestamp:

Aug 20, 2013, 5:52:39 PM (11 years ago)

Author:

ldelgass

Message:

Add config.h option USE_ARB_PROGRAMS, which will use ARB_vertex/fragment_program
extensions as the Cg compile target instead of NV_vertex_program3 and
NV_fragment_program2. Note that glyph texture style rendering in flows will not
work if this define is set (however, the default style is line arrows which will
work).

File:

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

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -504 +504 @@
     }
 #endif
-    // FIXME: should use ARB programs or (preferably) a GLSL profile for portability
+    // FIXME: should use GLSL for portability
+#ifdef USE_ARB_PROGRAMS
+    if (!GLEW_ARB_vertex_program ||
+        !GLEW_ARB_fragment_program) {
+        ERROR("ARB_vertex_program and ARB_fragment_program extensions are required");
+        return false;
+    }
+#else
     if (!GLEW_NV_vertex_program3 ||
         !GLEW_NV_fragment_program2) {
@@ -510 +517 @@
         return false;
     }
+#endif
 
     if (!FilePath::getInstance()->setPath(path)) {