#include "image.hpp"
#include "retrace.hpp"
#include "glproc.hpp"
+#include "glstate.hpp"
#include "glretrace.hpp"
void
checkGlError(Trace::Call &call) {
- if (benchmark || insideGlBeginEnd) {
- return;
- }
-
GLenum error = glGetError();
if (error == GL_NO_ERROR) {
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);
-}
-
-
void snapshot(unsigned call_no) {
if (!drawable ||
(!snapshot_prefix && !compare_prefix)) {
}
}
- 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) {
+ 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;
}
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"
+ " -db use a double buffer visual (default)\n"
+ " -sb use a single buffer visual\n"
" -s PREFIX take snapshots\n"
" -v verbose output\n"
" -D CALLNO dump state at specific call no\n"
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;