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

Timestamp:

Sep 27, 2005, 6:51:07 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: flushing

File:

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

trunk/src/lib/graphics/shader.cc

@@ -52 +52 @@
   try  {
    glLinkProgramARB(this->shaderProgram); }
-  catch(char* str)  {
+  catch(GLenum errorCode)  {
    this->printError(this->shaderProgram); }
 }
@@ -80 +80 @@
 
   const char* program = fileRead(fileName);
-
+  GLenum shader = 0;
   if (type == SHADER_VERTEX && GLEW_ARB_vertex_shader)
   {
@@ -86 +86 @@
     strcpy(this->vertexShaderFile, fileName);
 
-    this->vertexShader = glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB);
-    try {
-      glShaderSourceARB(this->vertexShader, 1, (const GLcharARB**)&program, NULL);
-      glCompileShaderARB(this->vertexShader);
-      glAttachObjectARB(this->shaderProgram, this->vertexShader);
-    }
-    catch (char * tmp)
-    {
-      this->printError(this->vertexShader);
-    }
+    shader = this->vertexShader = glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB);
   }
 
@@ -103 +94 @@
     strcpy(this->fragmentShaderFile, fileName);
 
-    this->fragmentShader = glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB);
-    try
-    {
-      glShaderSourceARB(this->fragmentShader, 1, (const GLcharARB**)&program, NULL);
-      glCompileShaderARB(this->fragmentShader);
-      glAttachObjectARB(this->shaderProgram, this->fragmentShader);
-    }
-    catch (char* tmp)
-    {
-      this->printError(this->fragmentShader);
-    }
-  }
-
+    shader = this->fragmentShader = glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB);
+  }
+  glShaderSourceARB(shader, 1, (const GLcharARB**)&program, NULL);
+  try {
+    glCompileShaderARB(shader);
+  }
+  catch (...)
+  {
+    this->printError(shader);
+  }
+  glAttachObjectARB(this->shaderProgram, shader);
   delete[] program;
 }
@@ -190 +179 @@
   if (infologLength > 0)
   {
-    infoLog = (char *)malloc(infologLength);
+    infoLog = (char *)malloc(sizeof(char) * (infologLength+1));
     glGetInfoLogARB(program, infologLength, &charsWritten, infoLog);
-    printf("%s\n",infoLog);
+    printf("%s\n", infoLog);
     free(infoLog);
   }