Changeset 1199

Timestamp:

Oct 29, 2008, 11:39:56 AM (16 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers/nanovis

Files:

• Trace.cpp (modified) (2 diffs)
• Trace.h (modified) (1 diff)
• nanovis.cpp (modified) (4 diffs)

trunk/packages/vizservers/nanovis/Trace.cpp

@@ -18 +18 @@
 }
 
-void 
-CheckFramebuffer(const char *string) 
+bool
+CheckFramebuffer(GLenum *statusPtr) 
 {
+    *statusPtr = (GLenum)glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+    return (*statusPtr == GL_FRAMEBUFFER_COMPLETE_EXT);
+}
+
+
+
+void
+PrintFramebufferStatus(GLenum status, const char *string) 
+{
+  const char *mesg;
   fprintf(stderr, "FB Status: %s: ", string);
-  GLenum status = (GLenum)glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
   switch(status) {
     case GL_FRAMEBUFFER_COMPLETE_EXT:
-      fprintf(stderr, "<<<< OK >>>>\n");
+      mesg = "<<<< OK >>>>";
       break;
     case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT:
-      fprintf(stderr, "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT\n");
+      mesg = "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT";
       break;
     case GL_FRAMEBUFFER_UNSUPPORTED_EXT:
-      fprintf(stderr, "GL_FRAMEBUFFER_UNSUPPORTED_EXT\n");
+      mesg = "GL_FRAMEBUFFER_UNSUPPORTED_EXT";
       break;
     case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT:
-      fprintf(stderr, "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT\n");
+      mesg = "GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT";
       break;
     case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT:
-      fprintf(stderr, "GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT\n");
+      mesg = "GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT";
       break;
     case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT:
-      fprintf(stderr, "GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT\n");
+      mesg = "GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT";
       break;
     case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT:
-      fprintf(stderr, "GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT\n");
+      mesg = "GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT";
       break;
     case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT:
-      fprintf(stderr, "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT\n");
+      mesg = "GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT";
       break;
     default:
-      fprintf(stderr, "UNKNOWN framebuffer status %d\n", status);
+      fprintf(stderr, "UNKNOWN framebuffer status %u\n", (unsigned int)status);
+      return;
   }
+  fprintf(stderr, "%d\n", mesg);
 }
 
@@ -56 +67 @@
 CheckGL(const char *string)
 {
-  fprintf(stderr, "GL Status: %s: ", string);
+  const char *mesg;
   GLenum status = (GLenum)glGetError();
   switch(status) {
     case GL_NO_ERROR:
-      fprintf(stderr, "OK\n");
       return true;
     case GL_INVALID_ENUM:
-      fprintf(stderr, "GL_INVALID_ENUM\n");
-      break;
+      mesg = "GL_INVALID_ENUM"; break;
     case GL_INVALID_VALUE:
-      fprintf(stderr, "GL_INVALID_VALUE\n");
-      break;
+      mesg = "GL_INVALID_VALUE"; break;
     case GL_INVALID_OPERATION:
-      fprintf(stderr, "GL_INVALID_OPERATION\n");
-      break;
+      mesg = "GL_INVALID_OPERATION"; break;
     case GL_STACK_OVERFLOW:
-      fprintf(stderr, "GL_STACK_OVERFLOW\n");
-      break;
+      mesg = "GL_STACK_OVERFLOW"; break;
     case GL_STACK_UNDERFLOW:
-      fprintf(stderr, "GL_STACK_UNDERFLOW\n");
-      break;
+      mesg = "GL_STACK_UNDERFLOW"; break;
     case GL_OUT_OF_MEMORY:
-      fprintf(stderr, "GL_OUT_OF_MEMORY\n");
-      break;
+      mesg = "GL_OUT_OF_MEMORY"; break;
     case GL_INVALID_FRAMEBUFFER_OPERATION_EXT:
-      fprintf(stderr, "GL_INVALID_FRAMEBUFFER_OPERATION_EXT\n");
-      break;
+      mesg = "GL_INVALID_FRAMEBUFFER_OPERATION_EXT"; break;
     default:
-      fprintf(stderr, "UNKNOWN GL status %d\n", status);
+      fprintf(stderr, "UNKNOWN GL status %d: %s\n", status, string);
+      return false;
   } 
+  fprintf(stderr, "GL Status: %s: %s", string, mesg);
   return false;
 }

trunk/packages/vizservers/nanovis/Trace.h

@@ -2 +2 @@
 #define __TRACE_H__
 
+#include <GL/glew.h>
+#include <GL/glut.h>
+
 extern void Trace(const char* format, ...);
-extern void CheckFramebuffer(const char *string);
+extern bool CheckFramebuffer(GLenum *statusPtr);
+extern void PrintFramebufferStatus(GLenum status, const char *string);
 extern bool CheckGL(const char *string);
 #endif

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -579 +579 @@
     //glReadPixels(0, 0, width, height, GL_BGR, GL_UNSIGNED_BYTE, screen_buffer); // INSOO's
 
-    if (!debug_flag) {
+    if (debug_flag) {
+        fprintf(stderr, "ppm legend image not written (debug mode)\n");
+    } else {
         char prefix[200];
         sprintf(prefix, "nv>legend %s %g %g", volArg, min, max);
@@ -631 +633 @@
         GL_RENDERBUFFER_EXT, final_depth_rb);
     CheckGL("glFramebufferTexture2DEXT");
-    CheckFramebuffer("final_fbo");
-
+    GLenum status;
+    if (!CheckFramebuffer(&status)) {
+       if (debug_flag) {
+          PrintFramebufferStatus(status, "final_fbo");
+       }
+    }
     // Check framebuffer completeness at the end of initialization.
     //CHECK_FRAMEBUFFER_STATUS();
@@ -708 +714 @@
 
     CheckGL("glFramebufferText2DEXT");
-    CheckFramebuffer("final_fbo");
-    CHECK_FRAMEBUFFER_STATUS();
+    GLenum status;
+    if (!CheckFramebuffer(&status)) {
+       if (debug_flag) {
+          PrintFramebufferStatus(status, "final_fbo");
+       }
+    }
+    //CHECK_FRAMEBUFFER_STATUS();
     if (debug_flag) {
        fprintf(stderr, "leaving resize_offscreen_buffer(%d, %d)\n", w, h);
@@ -2233 +2244 @@
     write(0, rle, rle_size);    //unsigned byte
 #else
-    if (!debug_flag) {
+    if (debug_flag) {
+        fprintf(stderr, "ppm image not written (debug mode)\n");
+    } else {
         NanoVis::ppm_write("nv>image -bytes");
     }
 #endif
     if (feof(NanoVis::stdin)) {
-        exit(2);
+        DoExit(2);
     }
     if (debug_flag) {