bool insideList = false;
bool insideGlBeginEnd = false;
+bool supportsARBShaderObjects = false;
+
+enum {
+ GPU_START = 0,
+ GPU_DURATION,
+ OCCLUSION,
+ NUM_QUERIES,
+};
struct CallQuery
{
- GLuint ids[3];
+ GLuint ids[NUM_QUERIES];
unsigned call;
bool isDraw;
GLuint program;
}
}
-static void
-getCurrentTimes(int64_t& cpuTime, int64_t& gpuTime) {
- GLuint query;
-
+static inline int64_t
+getCurrentTime(void) {
if (retrace::profilingGpuTimes && supportsTimestamp) {
- glGenQueries(1, &query);
- glQueryCounter(query, GL_TIMESTAMP);
- glGetQueryObjecti64vEXT(query, GL_QUERY_RESULT, &gpuTime);
- } else {
- gpuTime = 0;
- }
-
- if (retrace::profilingCpuTimes) {
- cpuTime = os::getTime();
+ /* Get the current GL time without stalling */
+ GLint64 timestamp = 0;
+ glGetInteger64v(GL_TIMESTAMP, ×tamp);
+ return timestamp;
} else {
- cpuTime = 0;
+ return os::getTime();
}
+}
+static inline int64_t
+getTimeFrequency(void) {
if (retrace::profilingGpuTimes && supportsTimestamp) {
- glDeleteQueries(1, &query);
+ return 1000000000;
+ } else {
+ return os::timeFrequency;
}
}
if (query.isDraw) {
if (retrace::profilingGpuTimes) {
if (supportsTimestamp) {
- glGetQueryObjecti64vEXT(query.ids[0], GL_QUERY_RESULT, &gpuStart);
+ glGetQueryObjecti64vEXT(query.ids[GPU_START], GL_QUERY_RESULT, &gpuStart);
}
- glGetQueryObjecti64vEXT(query.ids[1], GL_QUERY_RESULT, &gpuDuration);
+ glGetQueryObjecti64vEXT(query.ids[GPU_DURATION], GL_QUERY_RESULT, &gpuDuration);
}
if (retrace::profilingPixelsDrawn) {
- glGetQueryObjecti64vEXT(query.ids[2], GL_QUERY_RESULT, &pixels);
+ glGetQueryObjecti64vEXT(query.ids[OCCLUSION], GL_QUERY_RESULT, &pixels);
}
- glDeleteQueries(3, query.ids);
} else {
pixels = -1;
}
cpuDuration = query.cpuEnd - query.cpuStart;
}
+ glDeleteQueries(NUM_QUERIES, query.ids);
+
/* Add call to profile */
retrace::profiler.addCall(query.call, query.sig->name, query.program, pixels, gpuStart, gpuDuration, query.cpuStart, cpuDuration);
}
query.sig = call.sig;
query.program = currentContext ? currentContext->activeProgram : 0;
+ glGenQueries(NUM_QUERIES, query.ids);
+
/* GPU profiling only for draw calls */
if (isDraw) {
- glGenQueries(3, query.ids);
-
if (retrace::profilingGpuTimes) {
if (supportsTimestamp) {
- glQueryCounter(query.ids[0], GL_TIMESTAMP);
+ glQueryCounter(query.ids[GPU_START], GL_TIMESTAMP);
}
- glBeginQuery(GL_TIME_ELAPSED, query.ids[1]);
+ glBeginQuery(GL_TIME_ELAPSED, query.ids[GPU_DURATION]);
}
if (retrace::profilingPixelsDrawn) {
- glBeginQuery(GL_SAMPLES_PASSED, query.ids[2]);
+ glBeginQuery(GL_SAMPLES_PASSED, query.ids[OCCLUSION]);
}
}
/* CPU profiling for all calls */
if (retrace::profilingCpuTimes) {
- callQueries.back().cpuStart = os::getTime();
+ CallQuery& query = callQueries.back();
+ query.cpuStart = getCurrentTime();
}
}
void
endProfile(trace::Call &call, bool isDraw) {
- GLint64 time = os::getTime();
/* CPU profiling for all calls */
if (retrace::profilingCpuTimes) {
CallQuery& query = callQueries.back();
- query.cpuEnd = time;
+ query.cpuEnd = getCurrentTime();
}
/* GPU profiling only for draw calls */
supportsElapsed = currentContext->hasExtension("GL_EXT_timer_query") || supportsTimestamp;
supportsOcclusion = currentContext->hasExtension("GL_ARB_occlusion_query");
supportsDebugOutput = currentContext->hasExtension("GL_ARB_debug_output");
+ supportsARBShaderObjects = currentContext->hasExtension("GL_ARB_shader_objects");
/* Check for timer query support */
if (retrace::profilingGpuTimes) {
/* Sync the gpu and cpu start times */
if (retrace::profilingCpuTimes || retrace::profilingGpuTimes) {
if (!retrace::profiler.hasBaseTimes()) {
- GLint64 gpuTime, cpuTime;
-
- getCurrentTimes(cpuTime, gpuTime);
- retrace::profiler.setBaseCpuTime(cpuTime);
- retrace::profiler.setBaseGpuTime(gpuTime);
+ GLint64 currentTime = getCurrentTime();
+ retrace::profiler.setBaseCpuTime(currentTime);
+ retrace::profiler.setBaseGpuTime(currentTime);
}
}
}
/* Complete any remaining queries */
flushQueries();
- /* GPU time drifts due to being relative times, not absolute and can be
- * affected by the gpu switch between processes.
- *
- * To attempt to compensate we resynchronise on frame end however there is
- * still noticeable drift within a single frame which we do not account for.
- */
- if (retrace::profilingCpuTimes || retrace::profilingGpuTimes) {
- int64_t cpuTime, gpuTime, error;
-
- getCurrentTimes(cpuTime, gpuTime);
- cpuTime = cpuTime - retrace::profiler.getBaseCpuTime();
- gpuTime = gpuTime - retrace::profiler.getBaseGpuTime();
- error = gpuTime - cpuTime * (1.0E9 / os::timeFrequency);
-
- retrace::profiler.setBaseGpuTime(retrace::profiler.getBaseGpuTime() + error);
- }
-
/* Indicate end of current frame */
retrace::profiler.addFrameEnd();
}
} /* namespace glretrace */
+class GLDumper : public retrace::Dumper {
+public:
+ image::Image *
+ getSnapshot(void) {
+ if (!glretrace::getCurrentContext()) {
+ return NULL;
+ }
+ return glstate::getDrawBufferImage();
+ }
+
+ bool
+ dumpState(std::ostream &os) {
+ glretrace::Context *currentContext = glretrace::getCurrentContext();
+ if (glretrace::insideGlBeginEnd ||
+ !currentContext) {
+ return false;
+ }
+ glstate::dumpCurrentContext(os);
+ return true;
+ }
+};
+
+static GLDumper glDumper;
+
+
void
retrace::setUp(void) {
glws::init();
+ dumper = &glDumper;
}
}
-image::Image *
-retrace::getSnapshot(void) {
- if (!glretrace::getCurrentContext()) {
- return NULL;
- }
-
- return glstate::getDrawBufferImage();
-}
-
-
-bool
-retrace::dumpState(std::ostream &os)
-{
- glretrace::Context *currentContext = glretrace::getCurrentContext();
-
- if (glretrace::insideGlBeginEnd ||
- !currentContext) {
- return false;
- }
-
- glstate::dumpCurrentContext(os);
-
- return true;
-}
-
void
retrace::flushRendering(void) {
glretrace::Context *currentContext = glretrace::getCurrentContext();