Changeset 5321 in orxonox.OLD for trunk/src

Timestamp:

Oct 8, 2005, 3:55:00 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more error-catchin in the shader

Location:

trunk/src/lib

Files:

• graphics/importer/model.h (modified) (1 diff)
• graphics/shader.cc (modified) (4 diffs)
• util/array.h (modified) (1 diff)

trunk/src/lib/graphics/importer/model.h

@@ -15 +15 @@
 
 // FORWARD DEFINITION //
-class Vector;
 template<class T> class Array;
 template<class T> class tList;

trunk/src/lib/graphics/shader.cc

@@ -85 +85 @@
     glDeleteObjectARB(this->vertexShader);
   if (this->shaderProgram != 0)
+  {
+    GLint status = 0;
     glDeleteObjectARB(this->shaderProgram);
-
+       // link error checking
+    glGetObjectParameterivARB(this->shaderProgram, GL_OBJECT_DELETE_STATUS_ARB, &status);
+    if (status == GL_INVALID_VALUE || status == GL_INVALID_OPERATION)
+      this->printError(this->shaderProgram);
+  }
 }
 
@@ -124 +130 @@
   {
     GLint status = 0;
-    glShaderSourceARB(shader, program->getCount(), (const GLcharARB**)program->getArray(), NULL);
+    glShaderSourceARB(shader, program->getCount(), (const char**)program->getArray(), NULL);
     glCompileShaderARB(shader);
     // checking on error.
@@ -214 +220 @@
     delete[] this->vertexShaderFile;
     this->vertexShaderFile = NULL;
+    glDetachObjectARB(this->shaderProgram, this->vertexShader);
     glDeleteObjectARB(this->vertexShader);
     glGetObjectParameterivARB(this->vertexShader, GL_OBJECT_DELETE_STATUS_ARB, &status);
@@ -224 +231 @@
     delete[] this->fragmentShaderFile;
     this->fragmentShaderFile = NULL;
+    glDetachObjectARB(this->shaderProgram, this->fragmentShader);
     glDeleteObjectARB(this->fragmentShader);
     glGetObjectParameterivARB(this->fragmentShader, GL_OBJECT_DELETE_STATUS_ARB, &status);

trunk/src/lib/util/array.h

@@ -37 +37 @@
 
     /** @returns The array */
-    inline const T* getArray () const { return this->array; };
+    inline T* getArray () const { return this->array; };
     inline const T getEntry(unsigned int number) const;
     /** * @returns The Count of entries in the Array*/