#include <string.h>
+#include "os_path.hpp"
#include "image.hpp"
#include "retrace.hpp"
#include "glproc.hpp"
bool double_buffer = true;
bool insideGlBeginEnd = false;
-Trace::Parser parser;
-glws::WindowSystem *ws = NULL;
+trace::Parser parser;
glws::Visual *visual = NULL;
glws::Drawable *drawable = NULL;
glws::Context *context = NULL;
unsigned dump_state = ~0;
void
-checkGlError(Trace::Call &call) {
+checkGlError(trace::Call &call) {
GLenum error = glGetError();
if (error == GL_NO_ERROR) {
return;
return;
}
- if (width <= glretrace::drawable->width &&
- height <= glretrace::drawable->height) {
+ if (drawable->visible &&
+ width <= drawable->width &&
+ height <= drawable->height) {
return;
}
return;
}
- glretrace::drawable->resize(width, height);
- if (!drawable->visible) {
- drawable->show();
- }
+ drawable->resize(width, height);
+ drawable->show();
+
glScissor(0, 0, width, height);
}
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::Path filename = os::Path::format("%s%010u.png", compare_prefix, call_no);
+ ref = image::readPNG(filename);
if (!ref) {
return;
}
}
}
- Image::Image *src = glstate::getDrawBufferImage(GL_RGBA);
+ image::Image *src = glstate::getDrawBufferImage(GL_RGBA);
if (!src) {
return;
}
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::Path filename = os::Path::format("%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);
}
}
retracer.addCallbacks(glx_callbacks);
retracer.addCallbacks(wgl_callbacks);
retracer.addCallbacks(cgl_callbacks);
+ retracer.addCallbacks(egl_callbacks);
- startTime = OS::GetTime();
- Trace::Call *call;
+ startTime = os::getTime();
+ trace::Call *call;
while ((call = parser.parse_call())) {
retracer.retrace(*call);
// Reached the end of trace
glFlush();
- long long endTime = OS::GetTime();
+ long long endTime = os::getTime();
float timeInterval = (endTime - startTime) * 1.0E-6;
if (retrace::verbosity >= -1) {
}
if (wait) {
- while (ws->processEvents()) {}
+ while (glws::processEvents()) {}
} else {
exit(0);
}
} 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) {
}
}
- ws = glws::createNativeWindowSystem();
- visual = ws->createVisual(double_buffer);
+ glws::init();
+ visual = glws::createVisual(double_buffer);
for ( ; i < argc; ++i) {
if (!parser.open(argv[i])) {
parser.close();
}
+
+ delete visual;
+ glws::cleanup();
return 0;
}