#include "image.hpp"
#include "retrace.hpp"
#include "glproc.hpp"
+#include "glstate.hpp"
#include "glretrace.hpp"
namespace glretrace {
-bool double_buffer = false;
+bool double_buffer = true;
bool insideGlBeginEnd = false;
Trace::Parser parser;
glws::WindowSystem *ws = NULL;
bool benchmark = false;
const char *compare_prefix = NULL;
const char *snapshot_prefix = NULL;
+enum frequency snapshot_frequency = FREQUENCY_NEVER;
unsigned dump_state = ~0;
void
checkGlError(Trace::Call &call) {
- if (benchmark || insideGlBeginEnd) {
- return;
- }
-
GLenum error = glGetError();
if (error == GL_NO_ERROR) {
return;
std::cerr << "\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 (width <= glretrace::drawable->width &&
+ height <= glretrace::drawable->height) {
+ return;
+ }
-static void color_snapshot(Image::Image &image) {
- GLint drawbuffer = double_buffer ? GL_BACK : GL_FRONT;
- GLint readbuffer = double_buffer ? GL_BACK : GL_FRONT;
- glGetIntegerv(GL_DRAW_BUFFER, &drawbuffer);
- glGetIntegerv(GL_READ_BUFFER, &readbuffer);
- glReadBuffer(drawbuffer);
-
- glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
- glPixelStorei(GL_PACK_SWAP_BYTES, GL_FALSE);
- glPixelStorei(GL_PACK_LSB_FIRST, GL_FALSE);
- glPixelStorei(GL_PACK_ROW_LENGTH, 0);
- glPixelStorei(GL_PACK_IMAGE_HEIGHT, 0);
- glPixelStorei(GL_PACK_SKIP_ROWS, 0);
- glPixelStorei(GL_PACK_SKIP_PIXELS, 0);
- glPixelStorei(GL_PACK_SKIP_IMAGES, 0);
- glPixelStorei(GL_PACK_ALIGNMENT, 1);
-
- glReadPixels(0, 0, image.width, image.height, GL_RGBA, GL_UNSIGNED_BYTE, image.pixels);
-
- glPopClientAttrib();
-
- glReadBuffer(readbuffer);
+ // 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);
}
}
}
- Image::Image src(drawable->width, drawable->height, true);
- color_snapshot(src);
+ Image::Image *src = glstate::getDrawBufferImage(GL_RGBA);
+ if (!src) {
+ return;
+ }
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";
+ }
}
}
if (ref) {
- std::cout << "Snapshot " << call_no << " average precision of " << src.compare(*ref) << " bits\n";
+ std::cout << "Snapshot " << call_no << " average precision of " << src->compare(*ref) << " bits\n";
delete ref;
}
+
+ delete src;
}
void frame_complete(unsigned call_no) {
++frame;
- snapshot(call_no);
+ if (snapshot_frequency == FREQUENCY_FRAME ||
+ snapshot_frequency == FREQUENCY_FRAMEBUFFER) {
+ snapshot(call_no);
+ }
}
static void display(void) {
+ startTime = OS::GetTime();
Trace::Call *call;
while ((call = parser.parse_call())) {
- const std::string &name = call->name();
+ const char *name = call->name();
if (retrace::verbosity >= 1) {
std::cout << *call;
if (!insideGlBeginEnd &&
drawable && context &&
call->no >= dump_state) {
- state_dump(std::cout);
+ glstate::dumpCurrentContext(std::cout);
exit(0);
}
"Usage: glretrace [OPTION] TRACE\n"
"Replay TRACE.\n"
"\n"
- " -b benchmark (no glgeterror; no messages)\n"
+ " -b benchmark mode (no error checking or warning messages)\n"
" -c PREFIX compare against snapshots\n"
- " -db use a double buffer visual\n"
- " -s PREFIX take snapshots\n"
+ " -db use a double buffer visual (default)\n"
+ " -sb use a single buffer visual\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"
" -w wait on final frame\n";
retrace::verbosity = -1;
} 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;
} else if (!strcmp(arg, "-db")) {
double_buffer = true;
+ } else if (!strcmp(arg, "-sb")) {
+ double_buffer = false;
} else if (!strcmp(arg, "--help")) {
usage();
return 0;
} else if (!strcmp(arg, "-s")) {
snapshot_prefix = argv[++i];
+ 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")) {
+ snapshot_frequency = FREQUENCY_FRAME;
+ } else if (!strcmp(arg, "framebuffer")) {
+ snapshot_frequency = FREQUENCY_FRAMEBUFFER;
+ } else if (!strcmp(arg, "draw")) {
+ snapshot_frequency = FREQUENCY_DRAW;
+ } else {
+ std::cerr << "error: unknown frequency " << arg << "\n";
+ usage();
+ return 1;
+ }
+ if (snapshot_prefix == NULL) {
+ snapshot_prefix = "";
+ }
} else if (!strcmp(arg, "-v")) {
++retrace::verbosity;
} else if (!strcmp(arg, "-w")) {
visual = ws->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();
}
return 0;