Changeset 3612 for trunk/packages/vizservers/nanovis/nanovisServer.cpp

Timestamp:

Apr 2, 2013 8:31:43 PM (11 years ago)

Author:

ldelgass

Message:

Remove Nv prefix from shader classes now that they are in nv namespace.

File:

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

trunk/packages/vizservers/nanovis/nanovisServer.cpp

@@ -33 +33 @@
 #include "PPMWriter.h"
 #include "ReadBuffer.h"
-#include "NvShader.h"
+#include "Shader.h"
 #ifdef USE_THREADS
 #include <pthread.h>
@@ -352 +352 @@
     NanoVis::removeAllData();
 
-    NvShader::exitCg();
+    Shader::exitCg();
 
     //close log file
@@ -436 +436 @@
 void cgErrorCallback(void)
 {
-    if (!NvShader::printErrorInfo()) {
+    if (!Shader::printErrorInfo()) {
         TRACE("Cg error, exiting...");
         exitService(1);
@@ -580 +580 @@
 
     // Override callback with one that cleans up server on exit
-    NvShader::setErrorCallback(cgErrorCallback);
+    Shader::setErrorCallback(cgErrorCallback);
 
     if (!NanoVis::initGL()) {