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

Timestamp:

Mar 19, 2012, 9:04:34 PM (13 years ago)

Author:

ldelgass

Message:

remove global.h header. Move global Cg context handle into NvShader? as a
static member. Move LoadCgSourceProgram? to NvShader?.cpp, but make shader
classes use the methods NvShader::loadVertex/FragmentProgram instead.
There are still some users of LoadCgSourceProgram? left that need the context
handle.

File:

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

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -63 +63 @@
 #include "HeightMap.h"
 #include "NvCamera.h"
+#include "NvEventLog.h"
+#include "RenderContext.h"
+#include "NvShader.h"
 #include "NvColorTableRenderer.h"
-#include "NvEventLog.h"
 #include "NvFlowVisRenderer.h"
 #include "NvLIC.h"
@@ -74 +76 @@
 #include "PointSet.h"
 #endif
-#include "RenderContext.h"
 #include "Switch.h"
 #include "Trace.h"
@@ -84 +85 @@
 
 #define SIZEOF_BMP_HEADER   54
-
-extern void NvInitCG(); // in Shader.cpp
 
 /// Indicates "up" axis
@@ -192 +191 @@
 
 PerfQuery *perf = NULL;                        //perfromance counter
-
-CGprogram m_passthru_fprog;
-CGparameter m_passthru_scale_param, m_passthru_bias_param;
 
 // Variables for mouse events
@@ -360 +356 @@
     removeAllData();
 
+    NvShader::exitCg();
+
 #ifdef EVENTLOG
     NvExitEventLog();
@@ -373 +371 @@
     closelog();
     exit(code);
-}
-
-CGprogram
-LoadCgSourceProgram(CGcontext context, const char *fileName, CGprofile profile, 
-                    const char *entryPoint)
-{
-    const char *path = R2FilePath::getInstance()->getPath(fileName);
-    if (path == NULL) {
-        ERROR("can't find program \"%s\"\n", fileName);
-    }
-    TRACE("cg program compiling: %s\n", path);
-    CGprogram program;
-    program = cgCreateProgramFromFile(context, CG_SOURCE, path, profile, 
-                                      entryPoint, NULL);
-    cgGLLoadProgram(program);
-    CGerror LastError = cgGetError();
-    if (LastError) {
-        ERROR("Error message: %s\n", cgGetLastListing(context));
-    }
-    TRACE("successfully compiled program: %s\n", path);
-    delete [] path;
-    return program;
 }
 
@@ -719 +695 @@
 void CgErrorCallback(void)
 {
-    CGerror lastError = cgGetError();
-
-    if (lastError) {
-        TRACE("\n---------------------------------------------------\n");
-        TRACE("%s\n\n", cgGetErrorString(lastError));
-        TRACE("%s\n", cgGetLastListing(g_context));
-        TRACE("-----------------------------------------------------\n");
+    if (!NvShader::printErrorInfo()) {
         TRACE("Cg error, exiting...\n");
-        cgDestroyContext(g_context);
         DoExit(-1);
     }
@@ -735 +704 @@
 {
     // print system information
-    system_info();
+    TRACE("-----------------------------------------------------------\n");
+    TRACE("OpenGL driver: %s %s\n", glGetString(GL_VENDOR),
+          glGetString(GL_VERSION));
+    TRACE("Graphics hardware: %s\n", glGetString(GL_RENDERER));
+    TRACE("-----------------------------------------------------------\n");
 
     if (path == NULL) {
@@ -758 +731 @@
     ImageLoaderFactory::getInstance()->addLoaderImpl("bmp", new BMPImageLoaderImpl());
 
-    NvInitCG();
+    NvShader::initCg();
     NvShader::setErrorCallback(CgErrorCallback);
 
@@ -774 +747 @@
     licRenderer = new NvLIC(NMESH, NPIX, NPIX, lic_axis, 
                             Vector3(lic_slice_x, lic_slice_y, lic_slice_z), 
-                            g_context);
+                            NvShader::getCgContext());
 
     grid = new Grid();
@@ -841 +814 @@
     renderContext = new graphics::RenderContext();
 
-    //create n 2D plane renderer
+    //create a 2D plane renderer
     plane_renderer = new PlaneRenderer(win_width, win_height);
 #if PROTOTYPE