namespace glretrace {
-bool double_buffer = false;
+bool double_buffer = true;
bool insideGlBeginEnd = false;
Trace::Parser parser;
-glws::WindowSystem *ws = NULL;
glws::Visual *visual = NULL;
glws::Drawable *drawable = NULL;
glws::Context *context = NULL;
return;
}
- if (retrace::verbosity == 0) {
- std::cout << call;
- std::cout.flush();
- }
+ std::ostream & os = retrace::warning(call);
- std::cerr << call.no << ": ";
- std::cerr << "warning: glGetError(";
- std::cerr << call.name();
- std::cerr << ") = ";
+ os << "glGetError(";
+ os << call.name();
+ os << ") = ";
switch (error) {
case GL_INVALID_ENUM:
- std::cerr << "GL_INVALID_ENUM";
+ os << "GL_INVALID_ENUM";
break;
case GL_INVALID_VALUE:
- std::cerr << "GL_INVALID_VALUE";
+ os << "GL_INVALID_VALUE";
break;
case GL_INVALID_OPERATION:
- std::cerr << "GL_INVALID_OPERATION";
+ os << "GL_INVALID_OPERATION";
break;
case GL_STACK_OVERFLOW:
- std::cerr << "GL_STACK_OVERFLOW";
+ os << "GL_STACK_OVERFLOW";
break;
case GL_STACK_UNDERFLOW:
- std::cerr << "GL_STACK_UNDERFLOW";
+ os << "GL_STACK_UNDERFLOW";
break;
case GL_OUT_OF_MEMORY:
- std::cerr << "GL_OUT_OF_MEMORY";
+ os << "GL_OUT_OF_MEMORY";
break;
case GL_INVALID_FRAMEBUFFER_OPERATION:
- std::cerr << "GL_INVALID_FRAMEBUFFER_OPERATION";
+ os << "GL_INVALID_FRAMEBUFFER_OPERATION";
break;
case GL_TABLE_TOO_LARGE:
- std::cerr << "GL_TABLE_TOO_LARGE";
+ os << "GL_TABLE_TOO_LARGE";
break;
default:
- std::cerr << error;
+ os << error;
break;
}
- std::cerr << "\n";
+ os << "\n";
+}
+
+/**
+ * Grow the current drawble.
+ *
+ * We need to infer the drawable size from GL calls because the drawable sizes
+ * are specified by OS specific calls which we do not trace.
+ */
+void
+updateDrawable(int width, int height) {
+ if (!drawable) {
+ return;
+ }
+
+ if (drawable->visible &&
+ width <= glretrace::drawable->width &&
+ height <= glretrace::drawable->height) {
+ return;
+ }
+
+ // Check for bound framebuffer last, as this may have a performance impact.
+ GLint draw_framebuffer = 0;
+ glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &draw_framebuffer);
+ if (draw_framebuffer != 0) {
+ return;
+ }
+
+ glretrace::drawable->resize(width, height);
+ if (!drawable->visible) {
+ drawable->show();
+ }
+ glScissor(0, 0, width, height);
}
}
if (snapshot_prefix) {
- char filename[PATH_MAX];
- snprintf(filename, sizeof filename, "%s%010u.png", snapshot_prefix, call_no);
- if (src->writePNG(filename) && retrace::verbosity >= 0) {
- std::cout << "Wrote " << filename << "\n";
+ if (snapshot_prefix[0] == '-' && snapshot_prefix[1] == 0) {
+ char comment[21];
+ snprintf(comment, sizeof comment, "%u", call_no);
+ src->writePNM(std::cout, comment);
+ } else {
+ char filename[PATH_MAX];
+ snprintf(filename, sizeof filename, "%s%010u.png", snapshot_prefix, call_no);
+ if (src->writePNG(filename) && retrace::verbosity >= 0) {
+ std::cout << "Wrote " << filename << "\n";
+ }
}
}
}
-void frame_complete(unsigned call_no) {
+void frame_complete(Trace::Call &call) {
++frame;
+ if (!drawable) {
+ return;
+ }
+
+ if (!drawable->visible) {
+ retrace::warning(call) << "could not infer drawable size (glViewport never called)\n";
+ }
+
if (snapshot_frequency == FREQUENCY_FRAME ||
snapshot_frequency == FREQUENCY_FRAMEBUFFER) {
- snapshot(call_no);
+ snapshot(call.no);
}
}
static void display(void) {
- Trace::Call *call;
+ retrace::Retracer retracer;
- while ((call = parser.parse_call())) {
- const char *name = call->name();
+ retracer.addCallbacks(gl_callbacks);
+ retracer.addCallbacks(glx_callbacks);
+ retracer.addCallbacks(wgl_callbacks);
+ retracer.addCallbacks(cgl_callbacks);
- if (retrace::verbosity >= 1) {
- std::cout << *call;
- std::cout.flush();
- }
+ startTime = OS::GetTime();
+ Trace::Call *call;
- if (name[0] == 'C' && name[1] == 'G' && name[2] == 'L') {
- glretrace::retrace_call_cgl(*call);
- }
- else if (name[0] == 'w' && name[1] == 'g' && name[2] == 'l') {
- glretrace::retrace_call_wgl(*call);
- }
- else if (name[0] == 'g' && name[1] == 'l' && name[2] == 'X') {
- glretrace::retrace_call_glx(*call);
- } else {
- retrace::retrace_call(*call);
- }
+ while ((call = parser.parse_call())) {
+ retracer.retrace(*call);
if (!insideGlBeginEnd &&
drawable && context &&
}
if (wait) {
- while (ws->processEvents()) {}
+ while (glws::processEvents()) {}
} else {
exit(0);
}
" -c PREFIX compare against snapshots\n"
" -db use a double buffer visual (default)\n"
" -sb use a single buffer visual\n"
- " -s PREFIX take snapshots\n"
+ " -s PREFIX take snapshots; `-` for PNM stdout output\n"
" -S FREQUENCY snapshot frequency: frame (default), framebuffer, or draw\n"
" -v verbose output\n"
" -D CALLNO dump state at specific call no\n"
} else if (!strcmp(arg, "-b")) {
benchmark = true;
retrace::verbosity = -1;
+ glws::debug = false;
} else if (!strcmp(arg, "-c")) {
compare_prefix = argv[++i];
+ if (snapshot_frequency == FREQUENCY_NEVER) {
+ snapshot_frequency = FREQUENCY_FRAME;
+ }
} else if (!strcmp(arg, "-D")) {
dump_state = atoi(argv[++i]);
retrace::verbosity = -2;
if (snapshot_frequency == FREQUENCY_NEVER) {
snapshot_frequency = FREQUENCY_FRAME;
}
+ if (snapshot_prefix[0] == '-' && snapshot_prefix[1] == 0) {
+ retrace::verbosity = -2;
+ }
} else if (!strcmp(arg, "-S")) {
arg = argv[++i];
if (!strcmp(arg, "frame")) {
}
}
- ws = glws::createNativeWindowSystem();
- visual = ws->createVisual(double_buffer);
+ glws::init();
+ visual = glws::createVisual(double_buffer);
for ( ; i < argc; ++i) {
- if (parser.open(argv[i])) {
- startTime = OS::GetTime();
- display();
- parser.close();
+ if (!parser.open(argv[i])) {
+ std::cerr << "error: failed to open " << argv[i] << "\n";
+ return 1;
}
+
+ display();
+
+ parser.close();
}
+
+ delete visual;
+ glws::cleanup();
return 0;
}
projects / apitrace / blobdiff