Changeset 5320 in orxonox.OLD for trunk/src/lib/graphics

Timestamp:

Oct 8, 2005, 3:31:18 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better error-checking in the Shaders

File:

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

trunk/src/lib/graphics/shader.cc

@@ -47 +47 @@
    if (GLEW_ARB_shader_objects && GLEW_ARB_shading_language_100)
      {
+       GLint status = 0;
+
        this->shaderProgram = glCreateProgramObjectARB();
 
@@ -53 +55 @@
        if (fragmentShaderFile != NULL)
          this->loadShaderProgramm(SHADER_FRAGMENT, fragmentShaderFile);
-       try  {
-         glLinkProgramARB(this->shaderProgram); }
-       catch(GLenum errorCode)  {
-         this->printError(this->shaderProgram); }
-     }
+       glLinkProgramARB(this->shaderProgram);
+       // link error checking
+       glGetObjectParameterivARB(this->shaderProgram, GL_OBJECT_LINK_STATUS_ARB, &status);
+       if (status == GL_INVALID_VALUE || status == GL_INVALID_OPERATION)
+         this->printError(this->shaderProgram);
+    }
    else
      {
@@ -120 +123 @@
   if (shader != 0)
   {
+    GLint status = 0;
     glShaderSourceARB(shader, program->getCount(), (const GLcharARB**)program->getArray(), NULL);
-      glCompileShaderARB(shader);
-        this->printError(shader);
-    glAttachObjectARB(this->shaderProgram, shader);
+    glCompileShaderARB(shader);
+    // checking on error.
+    glGetObjectParameterivARB(shader, GL_OBJECT_COMPILE_STATUS_ARB, &status);
+    if (status == GL_INVALID_VALUE || status == GL_INVALID_OPERATION)
+      this->printError(shader);
+    else
+      glAttachObjectARB(this->shaderProgram, shader);
   }
   for (unsigned int i=0; i< program->getCount(); i++)
@@ -201 +209 @@
 void Shader::deleteProgram(SHADER_TYPE type)
 {
+  GLint status;
   if (type == SHADER_VERTEX && this->vertexShader != 0)
   {
@@ -206 +215 @@
     this->vertexShaderFile = NULL;
     glDeleteObjectARB(this->vertexShader);
+    glGetObjectParameterivARB(this->vertexShader, GL_OBJECT_DELETE_STATUS_ARB, &status);
+    if (status == GL_INVALID_VALUE || status == GL_INVALID_OPERATION)
+      Shader::printError(this->vertexShader);
     this->vertexShader = 0;
   }
@@ -213 +225 @@
     this->fragmentShaderFile = NULL;
     glDeleteObjectARB(this->fragmentShader);
+    glGetObjectParameterivARB(this->fragmentShader, GL_OBJECT_DELETE_STATUS_ARB, &status);
+    if (status == GL_INVALID_VALUE || status == GL_INVALID_OPERATION)
+      Shader::printError(this->fragmentShader);
     this->fragmentShader = 0;
   }