X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=glretrace_main.cpp;h=785d6feaadf6bdbf90b4c359958b7478f2254315;hb=4fdd5632465440b4f584a74bd4c171aa225a16e5;hp=cd35889c9dff873303dd27d26274829d296e664d;hpb=757b2b61e1781fbc903413f8703628468fd6c2f9;p=apitrace diff --git a/glretrace_main.cpp b/glretrace_main.cpp index cd35889..785d6fe 100644 --- a/glretrace_main.cpp +++ b/glretrace_main.cpp @@ -26,8 +26,11 @@ #include +#include "os_string.hpp" +#include "os_time.hpp" #include "image.hpp" #include "retrace.hpp" +#include "trace_callset.hpp" #include "glproc.hpp" #include "glstate.hpp" #include "glretrace.hpp" @@ -37,9 +40,9 @@ namespace glretrace { bool double_buffer = true; bool insideGlBeginEnd = false; -Trace::Parser parser; -glws::WindowSystem *ws = NULL; -glws::Visual *visual = NULL; +trace::Parser parser; +glws::Profile defaultProfile = glws::PROFILE_COMPAT; +glws::Visual *visual[glws::PROFILE_MAX]; glws::Drawable *drawable = NULL; glws::Context *context = NULL; @@ -48,59 +51,56 @@ long long startTime = 0; bool wait = false; bool benchmark = false; -const char *compare_prefix = NULL; -const char *snapshot_prefix = NULL; -enum frequency snapshot_frequency = FREQUENCY_NEVER; +static const char *compare_prefix = NULL; +static const char *snapshot_prefix = NULL; +static trace::CallSet snapshot_frequency; +static trace::CallSet compare_frequency; unsigned dump_state = ~0; void -checkGlError(Trace::Call &call) { +checkGlError(trace::Call &call) { GLenum error = glGetError(); if (error == GL_NO_ERROR) { 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"; } /** @@ -115,8 +115,14 @@ updateDrawable(int width, int height) { return; } - if (width <= glretrace::drawable->width && - height <= glretrace::drawable->height) { + if (drawable->visible && + width <= drawable->width && + height <= drawable->height) { + return; + } + + // Ignore zero area viewports + if (width == 0 || height == 0) { return; } @@ -127,26 +133,26 @@ updateDrawable(int width, int height) { return; } - glretrace::drawable->resize(width, height); - if (!drawable->visible) { - drawable->show(); - } + drawable->resize(width, height); + drawable->show(); + glScissor(0, 0, width, height); } -void snapshot(unsigned call_no) { - if (!drawable || - (!snapshot_prefix && !compare_prefix)) { +static void +snapshot(unsigned call_no) { + assert(snapshot_prefix || compare_prefix); + + if (!drawable) { return; } - Image::Image *ref = NULL; + 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); + os::String filename = os::String::format("%s%010u.png", compare_prefix, call_no); + ref = image::readPNG(filename); if (!ref) { return; } @@ -155,7 +161,7 @@ void snapshot(unsigned call_no) { } } - Image::Image *src = glstate::getDrawBufferImage(GL_RGBA); + image::Image *src = glstate::getDrawBufferImage(); if (!src) { return; } @@ -166,8 +172,7 @@ void snapshot(unsigned call_no) { 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); + os::String filename = os::String::format("%s%010u.png", snapshot_prefix, call_no); if (src->writePNG(filename) && retrace::verbosity >= 0) { std::cout << "Wrote " << filename << "\n"; } @@ -183,38 +188,56 @@ void snapshot(unsigned call_no) { } -void frame_complete(unsigned call_no) { +void frame_complete(trace::Call &call) { ++frame; - if (snapshot_frequency == FREQUENCY_FRAME || - snapshot_frequency == FREQUENCY_FRAMEBUFFER) { - snapshot(call_no); + if (!drawable) { + return; + } + + if (!drawable->visible) { + retrace::warning(call) << "could not infer drawable size (glViewport never called)\n"; } } static void display(void) { - startTime = OS::GetTime(); - 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); + retracer.addCallbacks(egl_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); + while ((call = parser.parse_call())) { + bool swapRenderTarget = call->flags & trace::CALL_FLAG_SWAP_RENDERTARGET; + bool doSnapshot = + snapshot_frequency.contains(*call) || + compare_frequency.contains(*call) + ; + + // For calls which cause rendertargets to be swaped, we take the + // snapshot _before_ swapping the rendertargets. + if (doSnapshot && swapRenderTarget) { + if (call->flags & trace::CALL_FLAG_END_FRAME) { + // For swapbuffers/presents we still use this call number, + // spite not have been executed yet. + snapshot(call->no); + } else { + // Whereas for ordinate fbo/rendertarget changes we use the + // previous call's number. + snapshot(call->no - 1); + } } - else if (name[0] == 'g' && name[1] == 'l' && name[2] == 'X') { - glretrace::retrace_call_glx(*call); - } else { - retrace::retrace_call(*call); + + retracer.retrace(*call); + + if (doSnapshot && !swapRenderTarget) { + snapshot(call->no); } if (!insideGlBeginEnd && @@ -230,10 +253,10 @@ static void display(void) { // Reached the end of trace glFlush(); - long long endTime = OS::GetTime(); - float timeInterval = (endTime - startTime) * 1.0E-6; + long long endTime = os::getTime(); + float timeInterval = (endTime - startTime) * (1.0 / os::timeFrequency); - if (retrace::verbosity >= -1) { + if ((retrace::verbosity >= -1) || (retrace::profiling)) { std::cout << "Rendered " << frame << " frames" " in " << timeInterval << " secs," @@ -241,7 +264,7 @@ static void display(void) { } if (wait) { - while (ws->processEvents()) {} + while (glws::processEvents()) {} } else { exit(0); } @@ -254,12 +277,15 @@ static void usage(void) { "Replay TRACE.\n" "\n" " -b benchmark mode (no error checking or warning messages)\n" + " -p profiling mode (run whole trace, dump profiling info)\n" " -c PREFIX compare against snapshots\n" + " -C CALLSET calls to compare (default is every frame)\n" + " -core use core profile\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" + " -S CALLSET calls to snapshot (default is every frame)\n" + " -v increase output verbosity\n" " -D CALLNO dump state at specific call no\n" " -w wait on final frame\n"; } @@ -267,6 +293,8 @@ static void usage(void) { extern "C" int main(int argc, char **argv) { + assert(compare_frequency.empty()); + assert(snapshot_frequency.empty()); int i; for (i = 1; i < argc; ++i) { @@ -281,14 +309,26 @@ int main(int argc, char **argv) } else if (!strcmp(arg, "-b")) { benchmark = true; retrace::verbosity = -1; + glws::debug = false; + } else if (!strcmp(arg, "-p")) { + retrace::profiling = 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; + if (compare_frequency.empty()) { + compare_frequency = trace::CallSet(trace::FREQUENCY_FRAME); + } + } else if (!strcmp(arg, "-C")) { + compare_frequency = trace::CallSet(argv[++i]); + if (compare_prefix == NULL) { + compare_prefix = ""; } } else if (!strcmp(arg, "-D")) { dump_state = atoi(argv[++i]); retrace::verbosity = -2; + } else if (!strcmp(arg, "-core")) { + defaultProfile = glws::PROFILE_CORE; } else if (!strcmp(arg, "-db")) { double_buffer = true; } else if (!strcmp(arg, "-sb")) { @@ -298,25 +338,14 @@ int main(int argc, char **argv) return 0; } else if (!strcmp(arg, "-s")) { snapshot_prefix = argv[++i]; - if (snapshot_frequency == FREQUENCY_NEVER) { - snapshot_frequency = FREQUENCY_FRAME; + if (snapshot_frequency.empty()) { + snapshot_frequency = trace::CallSet(trace::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; - } + snapshot_frequency = trace::CallSet(argv[++i]); if (snapshot_prefix == NULL) { snapshot_prefix = ""; } @@ -331,8 +360,11 @@ int main(int argc, char **argv) } } - ws = glws::createNativeWindowSystem(); - visual = ws->createVisual(double_buffer); + glws::init(); + visual[glws::PROFILE_COMPAT] = glws::createVisual(double_buffer, glws::PROFILE_COMPAT); + visual[glws::PROFILE_CORE] = glws::createVisual(double_buffer, glws::PROFILE_CORE); + visual[glws::PROFILE_ES1] = glws::createVisual(double_buffer, glws::PROFILE_ES1); + visual[glws::PROFILE_ES2] = glws::createVisual(double_buffer, glws::PROFILE_ES2); for ( ; i < argc; ++i) { if (!parser.open(argv[i])) { @@ -345,6 +377,12 @@ int main(int argc, char **argv) parser.close(); } + for (int n = 0; n < glws::PROFILE_MAX; n++) { + delete visual[n]; + } + + glws::cleanup(); + return 0; }