Changeset 1482 for trunk/packages/vizservers/nanovis

Timestamp:

May 31, 2009 3:47:53 PM (15 years ago)

Author:

vrinside

Message:

delete shaders programs in deleting classes (NvLIC/NvParticleRednerer)

Location:

trunk/packages/vizservers/nanovis

Files:

• NvLIC.cpp (modified) (1 diff)
• NvParticleRenderer.cpp (modified) (2 diffs)
• NvShader.cpp (modified) (2 diffs)

trunk/packages/vizservers/nanovis/NvLIC.cpp

@@ -144 +144 @@
     cgDestroyParameter(m_plane_normal_param_render_vel);
     cgDestroyParameter(m_max_param);
+*/
     cgDestroyProgram(m_render_vel_fprog);
-*/
 
     delete [] slice_vector;

trunk/packages/vizservers/nanovis/NvParticleRenderer.cpp

@@ -29 +29 @@
 NvParticleAdvectionShader* NvParticleRenderer::_advectionShader = NULL;
 
+class NvParticleAdvectionShaderInstance {
+public :
+        NvParticleAdvectionShaderInstance()
+        {
+        }
+        ~NvParticleAdvectionShaderInstance()
+        {
+                if (NvParticleRenderer::_advectionShader)
+                {
+                        delete NvParticleRenderer::_advectionShader;
+                }
+        }
+};
+NvParticleAdvectionShaderInstance shaderInstance;
+
 NvParticleRenderer::NvParticleRenderer(int w, int h, CGcontext context) : 
     scale(1, 1, 1), 
@@ -136 +151 @@
 
     delete m_vertex_array;
-#ifdef notdef
-    delete _advectionShader;
-#endif
     delete [] data;
 }

trunk/packages/vizservers/nanovis/NvShader.cpp

@@ -18 +18 @@
 NvShader::~NvShader()
 {
-    cgDestroyProgram(_cgVP);
-    cgDestroyProgram(_cgFP);
+    resetPrograms();
 }
 
@@ -36 +35 @@
 void NvShader::resetPrograms()
 {
-    if (_cgVP != 0)
+    if (_cgVP > 0)
     {
         cgDestroyProgram(_cgVP);
     }
 
-    if (_cgFP != 0)
+    if (_cgFP > 0)
     {
         cgDestroyProgram(_cgFP);