#include "image.hpp"
#include "retrace.hpp"
#include "glproc.hpp"
+#include "glstate.hpp"
#include "glretrace.hpp"
glws::Drawable *drawable = NULL;
glws::Context *context = NULL;
-int window_width = 256, window_height = 256;
-
unsigned frame = 0;
long long startTime = 0;
bool wait = false;
unsigned dump_state = ~0;
void
-checkGlError(int callIdx) {
- if (benchmark || insideGlBeginEnd) {
- return;
- }
-
+checkGlError(Trace::Call &call) {
GLenum error = glGetError();
if (error == GL_NO_ERROR) {
return;
}
- if (callIdx >= 0) {
- std::cerr << callIdx << ": ";
+ if (retrace::verbosity == 0) {
+ std::cout << call;
+ std::cout.flush();
}
- std::cerr << "warning: glGetError() = ";
+ std::cerr << call.no << ": ";
+ std::cerr << "warning: glGetError(";
+ std::cerr << call.name();
+ std::cerr << ") = ";
+
switch (error) {
case GL_INVALID_ENUM:
std::cerr << "GL_INVALID_ENUM";
}
-static void 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);
- glReadPixels(0, 0, image.width, image.height, GL_RGBA, GL_UNSIGNED_BYTE, image.pixels);
- checkGlError();
- glReadBuffer(readbuffer);
-}
+void snapshot(unsigned call_no) {
+ if (!drawable ||
+ (!snapshot_prefix && !compare_prefix)) {
+ return;
+ }
+ Image::Image *ref = NULL;
-static void frame_complete(unsigned call_no) {
- ++frame;
-
- if (snapshot_prefix || compare_prefix) {
- Image::Image *ref = NULL;
- if (compare_prefix) {
- char filename[PATH_MAX];
- snprintf(filename, sizeof filename, "%s%010u.png", compare_prefix, call_no);
- ref = Image::readPNG(filename);
- if (!ref) {
- return;
- }
- if (retrace::verbosity >= 0)
- std::cout << "Read " << filename << "\n";
+ if (compare_prefix) {
+ char filename[PATH_MAX];
+ snprintf(filename, sizeof filename, "%s%010u.png", compare_prefix, call_no);
+ ref = Image::readPNG(filename);
+ if (!ref) {
+ return;
}
-
- Image::Image src(window_width, window_height, true);
- snapshot(src);
-
- 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 (retrace::verbosity >= 0) {
+ std::cout << "Read " << filename << "\n";
}
+ }
+
+ Image::Image *src = glstate::getDrawBufferImage(GL_RGBA);
+ if (!src) {
+ return;
+ }
- if (ref) {
- std::cout << "Snapshot " << call_no << " average precision of " << src.compare(*ref) << " bits\n";
- delete ref;
+ 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 (ref) {
+ 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);
}
Trace::Call *call;
while ((call = parser.parse_call())) {
- const std::string &name = call->name();
- bool skipCall = false;
-
- if ((name[0] == 'w' && name[1] == 'g' && name[2] == 'l') ||
- (name[0] == 'g' && name[1] == 'l' && name[2] == 'X')) {
- // XXX: We ignore the majority of the OS-specific calls for now
- if (name == "glXSwapBuffers" ||
- name == "wglSwapBuffers") {
- if (retrace::verbosity >= 1) {
- std::cout << *call;
- std::cout.flush();
- };
- frame_complete(call->no);
- if (double_buffer)
- drawable->swapBuffers();
- else
- glFlush();
- } else if (name == "glXMakeCurrent" ||
- name == "wglMakeCurrent") {
- glFlush();
- if (!double_buffer) {
- frame_complete(call->no);
- }
- }
- skipCall = true;
- }
+ const char *name = call->name();
- if (name == "glFlush") {
- glFlush();
- if (!double_buffer) {
- frame_complete(call->no);
- }
+ if (retrace::verbosity >= 1) {
+ std::cout << *call;
+ std::cout.flush();
}
- if (!skipCall) {
+ 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);
}
- if (!insideGlBeginEnd && call->no >= dump_state) {
- state_dump(std::cout);
+ if (!insideGlBeginEnd &&
+ drawable && context &&
+ call->no >= dump_state) {
+ 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;
ws = glws::createNativeWindowSystem();
visual = ws->createVisual(double_buffer);
- drawable = ws->createDrawable(visual);
- drawable->resize(window_width, window_height);
- context = ws->createContext(visual);
- ws->makeCurrent(drawable, context);
for ( ; i < argc; ++i) {
if (parser.open(argv[i])) {
projects / apitrace / blobdiff