Changeset 2954 for trunk/packages/vizservers

Timestamp:

Apr 9, 2012 7:39:27 PM (12 years ago)

Author:

ldelgass

Message:

Add parameter management and methods for setting parameters to NvShader?. This
will allow removing all Cg code from renderers and into the NvShader? wrapper.
This paves the way to converting shaders to GLSL and removing the Cg dependency.

Location:

trunk/packages/vizservers/nanovis

Files:

• NvShader.cpp (modified) (4 diffs)
• NvShader.h (modified) (5 diffs)

trunk/packages/vizservers/nanovis/NvShader.cpp

@@ -90 +90 @@
     TRACE("In ~NvShader");
     if (_cgContext == NULL) {
-        TRACE("Lost Cg context");
+        TRACE("Lost Cg context: vp: %s, fp: %s", _vpFile.c_str(), _fpFile.c_str());
     } else {
         resetPrograms();
@@ -103 +103 @@
     _cgVP = loadCgSourceProgram(_cgContext, fileName,
                                 _vertexProfile, entryPoint);
+    _vpFile = fileName;
 }
 
@@ -112 +113 @@
     _cgFP = loadCgSourceProgram(_cgContext, fileName,
                                 _fragmentProfile, entryPoint);
+    _fpFile = fileName;
 }
 
@@ -117 +119 @@
 {
     if (_cgVP != NULL) {
+        TRACE("Destroying vertex program: %s\n", _vpFile.c_str());
         cgDestroyProgram(_cgVP);
     }
 
     if (_cgFP != NULL) {
+        TRACE("Destroying fragment program: %s\n", _fpFile.c_str());
         cgDestroyProgram(_cgFP);
     }

trunk/packages/vizservers/nanovis/NvShader.h

@@ -3 +3 @@
 #define NV_SHADER_H
 
+#include <string>
+#include <tr1/unordered_map>
+
 #include <GL/glew.h>
 #include <Cg/cg.h>
@@ -16 +19 @@
 {
 public:
+    enum NvGLMatrix {
+        MODELVIEW_MATRIX = CG_GL_MODELVIEW_MATRIX,
+        PROJECTION_MATRIX = CG_GL_PROJECTION_MATRIX,
+        MODELVIEW_PROJECTION_MATRIX = CG_GL_MODELVIEW_PROJECTION_MATRIX
+    };
+    enum NvGLMatrixType {
+        MATRIX_IDENTITY = CG_GL_MATRIX_IDENTITY,
+        MATRIX_INVERSE = CG_GL_MATRIX_INVERSE
+    };
+
     typedef void NvCgCallbackFunction(void);
 
@@ -41 +54 @@
             return cgGetNamedParameter(_cgFP, paramName);
         }
+        ERROR("Unknown fragment program parameter: %s\n", paramName);
         return 0;
     }
@@ -49 +63 @@
             return cgGetNamedParameter(_cgVP, paramName);
         }
+        ERROR("Unknown vertex program parameter: %s\n", paramName);
         return 0;
     }
 
-    void setTextureParameter(CGparameter param, GLuint texobj)
-    {
+    void setVPParameter1f(const char *name, float val)
+    {
+        CGparameter param = getVPParam(name);
+        if (param == NULL)
+            return;
+        cgSetParameter1f(param, val);
+    }
+
+    void setFPParameter1f(const char *name, float val)
+    {
+        CGparameter param = getFPParam(name);
+        if (param == NULL)
+            return;
+        cgSetParameter1f(param, val);
+    }
+
+    void setVPParameter2f(const char *name, float val1, float val2)
+    {
+        CGparameter param = getVPParam(name);
+        if (param == NULL)
+            return;
+        cgSetParameter2f(param, val1, val2);
+    }
+
+    void setFPParameter2f(const char *name, float val1, float val2)
+    {
+        CGparameter param = getFPParam(name);
+        if (param == NULL)
+            return;
+        cgSetParameter2f(param, val1, val2);
+    }
+
+    void setVPParameter3f(const char *name, float val1, float val2, float val3)
+    {
+        CGparameter param = getVPParam(name);
+        if (param == NULL)
+            return;
+        cgSetParameter3f(param, val1, val2, val3);
+    }
+
+    void setFPParameter3f(const char *name, float val1, float val2, float val3)
+    {
+        CGparameter param = getFPParam(name);
+        if (param == NULL)
+            return;
+        cgSetParameter3f(param, val1, val2, val3);
+    }
+
+    void setVPParameter4f(const char *name, float val1, float val2, float val3, float val4)
+    {
+        CGparameter param = getVPParam(name);
+        if (param == NULL)
+            return;
+        cgSetParameter4f(param, val1, val2, val3, val4);
+    }
+
+    void setFPParameter4f(const char *name, float val1, float val2, float val3, float val4)
+    {
+        CGparameter param = getFPParam(name);
+        if (param == NULL)
+            return;
+        cgSetParameter4f(param, val1, val2, val3, val4);
+    }
+
+    void setVPTextureParameter(const char *name, GLuint texobj, bool enable = true)
+    {
+        CGparameter param = getVPParam(name);
+        if (param == NULL)
+            return;
         cgGLSetTextureParameter(param, texobj);
-    }
-
-    CGprogram getVP() const
-    {
-        return _cgVP;
-    }
-
-    CGprogram getFP() const
-    {
-        return _cgFP;
+        if (enable)
+            cgGLEnableTextureParameter(param);
+    }
+
+    void setFPTextureParameter(const char *name, GLuint texobj, bool enable = true)
+    {
+        CGparameter param = getFPParam(name);
+        if (param == NULL)
+            return;
+        ParameterHashmap::iterator itr = _fpParams.find(name);
+        cgGLSetTextureParameter(param, texobj);
+        if (enable)
+            cgGLEnableTextureParameter(param);
+    }
+
+    void enableVPTextureParameter(const char *name)
+    {
+        CGparameter param = getVPParam(name);
+        if (param == NULL)
+            return;
+        cgGLEnableTextureParameter(param);
+    }
+
+    void enaableFPTextureParameter(const char *name)
+    {
+        CGparameter param = getFPParam(name);
+        if (param == NULL)
+            return;
+        cgGLEnableTextureParameter(param);
+    }
+
+    void disableVPTextureParameter(const char *name)
+    {
+        CGparameter param = getVPParam(name);
+        if (param == NULL)
+            return;
+        cgGLDisableTextureParameter(param);
+    }
+
+    void disableFPTextureParameter(const char *name)
+    {
+        CGparameter param = getFPParam(name);
+        if (param == NULL)
+            return;
+        cgGLDisableTextureParameter(param);
+    }
+
+    void setGLStateMatrixVPParameter(const char *name, NvGLMatrix matrix, NvGLMatrixType type)
+    {
+        CGparameter param = getVPParam(name);
+        if (param == NULL)
+            return;
+        cgGLSetStateMatrixParameter(param, (CGGLenum)matrix, (CGGLenum)type);
+    }
+
+    void setGLStateMatrixFPParameter(const char *name, NvGLMatrix matrix, NvGLMatrixType type)
+    {
+        CGparameter param = getFPParam(name);
+        if (param == NULL)
+            return;
+        cgGLSetStateMatrixParameter(param, (CGGLenum)matrix, (CGGLenum)type);
     }
 
@@ -126 +259 @@
 
 protected:
+    typedef std::tr1::unordered_map<std::string, CGparameter> ParameterHashmap;
+
+    CGprogram getVP()
+    {
+        return _cgVP;
+    }
+
+    CGprogram getFP()
+    {
+        return _cgFP;
+    }
+
+    CGparameter getVPParam(const char *name)
+    {
+        CGparameter param;
+        ParameterHashmap::iterator itr = _vpParams.find(name);
+        if (itr == _vpParams.end()) {
+            param = getNamedParameterFromVP(name);
+            if (param != NULL)
+                _vpParams[name] = param;
+            else
+                ERROR("Unknown vertex program parameter: %s\n", name);
+        } else {
+            param = itr->second;
+        }
+        return param;
+    }
+
+    CGparameter getFPParam(const char *name)
+    {
+        CGparameter param;
+        ParameterHashmap::iterator itr = _fpParams.find(name);
+        if (itr == _fpParams.end()) {
+            param = getNamedParameterFromFP(name);
+            if (param != NULL)
+                _fpParams[name] = param;
+            else
+                ERROR("Unknown fragment program parameter: %s\n", name);
+        } else {
+            param = itr->second;
+        }
+        return param;
+    }
+
     void resetPrograms();
 
     CGprofile _vertexProfile;
     CGprofile _fragmentProfile;
+    std::string _vpFile;
     CGprogram _cgVP;
+    std::string _fpFile;
     CGprogram _cgFP;
+    ParameterHashmap _vpParams;
+    ParameterHashmap _fpParams;
 
     static CGprofile _defaultVertexProfile;