Changeset 3452 for trunk/packages/vizservers/nanovis/NvShader.cpp

Timestamp:

Mar 4, 2013, 8:57:13 PM (12 years ago)

Author:

ldelgass

Message:

Remove XINETD define from nanovis. We only support server mode now, no glut
interaction loop with mouse/keyboard handlers. Fixes for trace logging to make
output closer to vtkvis: inlcude function name for trace messages, remove
newlines from format strings in macros since newlines get added by syslog.

File:

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

trunk/packages/vizservers/nanovis/NvShader.cpp

@@ -40 +40 @@
 
     if (lastError) {
-        TRACE("Cg Error: %s\n", cgGetErrorString(lastError));
+        TRACE("Cg Error: %s", cgGetErrorString(lastError));
         if (getCgContext())
-            TRACE("%s\n", cgGetLastListing(getCgContext()));
+            TRACE("%s", cgGetLastListing(getCgContext()));
         return false;
     }
@@ -54 +54 @@
     std::string path = R2FilePath::getInstance()->getPath(fileName);
     if (path.empty()) {
-        ERROR("can't find program \"%s\"\n", fileName);
+        ERROR("can't find program \"%s\"", fileName);
     }
-    TRACE("cg program compiling: %s\n", path.c_str());
+    TRACE("cg program compiling: %s", path.c_str());
     CGprogram program;
     program = cgCreateProgramFromFile(context, CG_SOURCE, path.c_str(), profile, 
@@ -63 +63 @@
     CGerror LastError = cgGetError();
     if (LastError) {
-        ERROR("Error message: %s\n", cgGetLastListing(context));
+        ERROR("Error message: %s", cgGetLastListing(context));
     }
-    TRACE("successfully compiled program: %s\n", path.c_str());
+    TRACE("successfully compiled program: %s", path.c_str());
     return program;
 }
@@ -110 +110 @@
 {
     if (_cgVP != NULL) {
-        TRACE("Destroying vertex program: %s\n", _vpFile.c_str());
+        TRACE("Destroying vertex program: %s", _vpFile.c_str());
         cgDestroyProgram(_cgVP);
     }
 
     if (_cgFP != NULL) {
-        TRACE("Destroying fragment program: %s\n", _fpFile.c_str());
+        TRACE("Destroying fragment program: %s", _fpFile.c_str());
         cgDestroyProgram(_cgFP);
     }
@@ -122 +122 @@
 void NvShader::setErrorCallback(NvCgCallbackFunction callback)
 {
-    TRACE("NvShader setting error callback to: %p\n", callback);
+    TRACE("NvShader setting error callback to: %p", callback);
     cgSetErrorCallback(callback);
 }