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

Timestamp:

Apr 1, 2012, 12:26:04 PM (13 years ago)

Author:

ldelgass

Message:

Begin to isolate Cg code in NvShader? and subclasses. Add Cg profile defaults
and instance members to centralize profile. Add bind/unbind methods to
NvShader? that bind/unbind programs with the appropriate profile. Add a
private static method loadCgSourceProgram to replace the global
LoadCgSourceProgram? after all users are converted to using NvShader? and its
loader methods.

File:

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

trunk/packages/vizservers/nanovis/NvShader.cpp

@@ -11 +11 @@
 #include "Trace.h"
 
+CGprofile NvShader::_defaultVertexProfile = CG_PROFILE_VP40;
+CGprofile NvShader::_defaultFragmentProfile = CG_PROFILE_FP40;
 CGcontext NvShader::_cgContext = NULL;
 
-void NvShader::initCg()
+void NvShader::initCg(CGprofile defaultVertexProfile,
+                      CGprofile defaultFragmentProfile)
 {
+    _defaultVertexProfile = defaultVertexProfile;
+    _defaultFragmentProfile = defaultFragmentProfile;
     _cgContext = cgCreateContext();
 }
@@ -23 +28 @@
     printErrorInfo();
     if (_cgContext != NULL) {
+        TRACE("Before DestroyContext");
         cgDestroyContext(_cgContext);
+        TRACE("After DestroyContext");
         _cgContext = NULL;
     }
@@ -42 +49 @@
 
 CGprogram
-LoadCgSourceProgram(CGcontext context, const char *fileName, CGprofile profile, 
-                    const char *entryPoint)
+LoadCgSourceProgram(CGcontext context, const char *fileName,
+                    CGprofile profile, const char *entryPoint)
+{
+    return NvShader::loadCgSourceProgram(context, fileName,
+                                         profile, entryPoint);
+}
+
+CGprogram
+NvShader::loadCgSourceProgram(CGcontext context, const char *fileName,
+                              CGprofile profile, const char *entryPoint)
 {
     const char *path = R2FilePath::getInstance()->getPath(fileName);
@@ -64 +79 @@
 
 NvShader::NvShader():
+    _vertexProfile(_defaultVertexProfile),
+    _fragmentProfile(_defaultFragmentProfile),
     _cgVP(NULL),
     _cgFP(NULL)
@@ -71 +88 @@
 NvShader::~NvShader()
 {
-    resetPrograms();
+    TRACE("In ~NvShader");
+    if (_cgContext == NULL) {
+        TRACE("Lost Cg context");
+    } else {
+        resetPrograms();
+    }
 }
 
 void NvShader::loadVertexProgram(const char *fileName, const char *entryPoint)
 {
-    resetPrograms();
-
-    _cgVP = LoadCgSourceProgram(_cgContext, fileName, CG_PROFILE_VP40, entryPoint);
+    if (_cgVP != NULL) {
+        cgDestroyProgram(_cgVP);
+    }
+    _cgVP = loadCgSourceProgram(_cgContext, fileName,
+                                _vertexProfile, entryPoint);
 }
 
 void NvShader::loadFragmentProgram(const char *fileName, const char *entryPoint)
 {
-    _cgFP = LoadCgSourceProgram(_cgContext, fileName, CG_PROFILE_FP40, entryPoint);
+    if (_cgFP != NULL) {
+        cgDestroyProgram(_cgFP);
+    }
+    _cgFP = loadCgSourceProgram(_cgContext, fileName,
+                                _fragmentProfile, entryPoint);
 }