Changeset 5319 in orxonox.OLD for trunk/src/lib/graphics/shader.cc

Timestamp:

Oct 8, 2005, 3:10:38 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some minor file-handling

File:

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

trunk/src/lib/graphics/shader.cc

@@ -91 +91 @@
 bool Shader::loadShaderProgramm(SHADER_TYPE type, const char* fileName)
 {
-  GLenum shader = 0;
+  GLhandleARB shader = 0;
 
   if (type != SHADER_VERTEX && type != SHADER_FRAGMENT)
@@ -119 +119 @@
 
   if (shader != 0)
-    {
-      glShaderSourceARB(shader, program->getCount(), (const GLcharARB**)program->getArray(), NULL);
-        glCompileShaderARB(shader);
-          this->printError(shader);
-      glAttachObjectARB(this->shaderProgram, shader);
-    }
-    delete program;
+  {
+    glShaderSourceARB(shader, program->getCount(), (const GLcharARB**)program->getArray(), NULL);
+      glCompileShaderARB(shader);
+        this->printError(shader);
+    glAttachObjectARB(this->shaderProgram, shader);
+  }
+  for (unsigned int i=0; i< program->getCount(); i++)
+    delete[] program->getArray()[i];
+  delete program;
 }
 
@@ -218 +220 @@
 
 
-void Shader::printError(GLenum program)
+void Shader::printError(GLhandleARB program)
 {
   if (program == 0)