Changeset 5322 in orxonox.OLD for trunk/src/lib

Timestamp:

Oct 8, 2005, 4:37:43 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: smooth unloading of Shaders. but not perfect.

File:

• trunk/src/lib/graphics/shader.cc (modified) (2 diffs)

trunk/src/lib/graphics/shader.cc

@@ -73 +73 @@
 Shader::~Shader ()
 {
-  if (storedShader == this)
+  if (this->shaderProgram == glGetHandleARB(GL_PROGRAM_OBJECT_ARB))
     Shader::deactivateShader();
 
@@ -81 +81 @@
 
   if (this->fragmentShader != 0)
+  {
+    glDetachObjectARB(this->shaderProgram, this->fragmentShader);
     glDeleteObjectARB(this->fragmentShader);
+  }
   if (this->vertexShader != 0)
+  {
+    glDetachObjectARB(this->shaderProgram, this->vertexShader);
     glDeleteObjectARB(this->vertexShader);
+  }
   if (this->shaderProgram != 0)
   {
     GLint status = 0;
+    //glLinkProgramARB(this->shaderProgram);
     glDeleteObjectARB(this->shaderProgram);
        // link error checking