unsigned call;
GLuint program;
const trace::FunctionSig *sig;
- uint64_t start;
- uint64_t duration;
+ uint64_t cpuStart;
+ uint64_t cpuEnd;
};
static bool supportsElapsed = true;
static bool supportsTimestamp = true;
static bool supportsOcclusion = true;
+static bool supportsDebugOutput = true;
static bool firstFrame = true;
static std::list<CallQuery> callQueries;
-static void
+static void APIENTRY
debugOutputCallback(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, GLvoid* userParam);
void
os << "\n";
}
-static GLuint64
+static inline GLuint64
getGpuTimestamp() {
GLuint query = 0;
GLuint64 timestamp = 0;
return timestamp;
}
-static GLuint64
+static inline GLuint64
getCpuTimestamp() {
if (retrace::profilingCpuTimes) {
- return os::getTime() * (1.0E9 / os::timeFrequency);
+ return os::getTime();
} else {
return 0;
}
static void
completeCallQuery(CallQuery& query) {
/* Get call start and duration */
- GLuint64 timestamp = 0, duration = 0, samples = 0;
+ GLuint64 gpuStart = 0, gpuDuration = 0, cpuDuration = 0, samples = 0;
if (retrace::profilingGpuTimes) {
if (supportsTimestamp) {
- glGetQueryObjectui64vEXT(query.ids[0], GL_QUERY_RESULT, ×tamp);
+ glGetQueryObjectui64vEXT(query.ids[0], GL_QUERY_RESULT, &gpuStart);
}
- if (supportsElapsed) {
- glGetQueryObjectui64vEXT(query.ids[1], GL_QUERY_RESULT, &duration);
- }
+ glGetQueryObjectui64vEXT(query.ids[1], GL_QUERY_RESULT, &gpuDuration);
+ }
+
+ if (retrace::profilingCpuTimes) {
+ cpuDuration = query.cpuEnd - query.cpuStart;
}
- if (retrace::profilingPixelsDrawn && supportsOcclusion) {
+ if (retrace::profilingPixelsDrawn) {
glGetQueryObjectui64vEXT(query.ids[2], GL_QUERY_RESULT, &samples);
}
glDeleteQueries(3, query.ids);
/* Add call to profile */
- retrace::profiler.addCall(query.call, query.sig->name, query.program, samples, timestamp, duration, query.start, query.duration);
+ retrace::profiler.addCall(query.call, query.sig->name, query.program, samples, gpuStart, gpuDuration, query.cpuStart, cpuDuration);
}
void
glQueryCounter(query.ids[0], GL_TIMESTAMP);
}
- if (supportsElapsed) {
- glBeginQuery(GL_TIME_ELAPSED, query.ids[1]);
- }
+ glBeginQuery(GL_TIME_ELAPSED, query.ids[1]);
}
- if (retrace::profilingPixelsDrawn && supportsOcclusion) {
+ if (retrace::profilingPixelsDrawn) {
glBeginQuery(GL_SAMPLES_PASSED, query.ids[2]);
}
if (retrace::profilingCpuTimes) {
- query.start = os::getTime();
+ query.cpuStart = getCpuTimestamp();
}
callQueries.push_back(query);
endProfile(trace::Call &call) {
if (retrace::profilingCpuTimes) {
CallQuery& query = callQueries.back();
- query.duration = (os::getTime() - query.start) * (1.0E9 / os::timeFrequency);
+ query.cpuEnd = getCpuTimestamp();
}
- if (retrace::profilingGpuTimes && supportsElapsed) {
+ if (retrace::profilingGpuTimes) {
glEndQuery(GL_TIME_ELAPSED);
}
- if (retrace::profilingPixelsDrawn && supportsOcclusion) {
+ if (retrace::profilingPixelsDrawn) {
glEndQuery(GL_SAMPLES_PASSED);
}
}
void
initContext() {
- /* Check for extension support */
- const char* extensions = (const char*)glGetString(GL_EXTENSIONS);
- GLint bits;
+ GLuint64 gpuTime, cpuTime;
+ const char* extensions;
+
+ extensions = (const char*)glGetString(GL_EXTENSIONS);
- supportsTimestamp = glws::checkExtension("GL_ARB_timer_query", extensions);
- supportsElapsed = glws::checkExtension("GL_EXT_timer_query", extensions) || supportsTimestamp;
- supportsOcclusion = glws::checkExtension("GL_ARB_occlusion_query", extensions);
+ /* Ensure we have adequate extension support */
+ supportsTimestamp = glws::checkExtension("GL_ARB_timer_query", extensions);
+ supportsElapsed = glws::checkExtension("GL_EXT_timer_query", extensions) || supportsTimestamp;
+ supportsOcclusion = glws::checkExtension("GL_ARB_occlusion_query", extensions);
+ supportsDebugOutput = glws::checkExtension("GL_ARB_debug_output", extensions);
if (retrace::profilingGpuTimes) {
if (!supportsTimestamp && !supportsElapsed) {
exit(-1);
}
+ GLint bits = 0;
glGetQueryiv(GL_TIME_ELAPSED, GL_QUERY_COUNTER_BITS, &bits);
if (!bits) {
exit(-1);
}
- if (retrace::debug) {
- bool supportsDebugOutput = glws::checkExtension("GL_ARB_debug_output", extensions);
+ if (retrace::debug && supportsDebugOutput) {
+ glDebugMessageCallbackARB(&debugOutputCallback, currentContext);
- if (supportsDebugOutput) {
- glDebugMessageCallbackARB(&debugOutputCallback, currentContext);
-
- if (DEBUG_OUTPUT_SYNCHRONOUS) {
- glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB);
- }
+ if (DEBUG_OUTPUT_SYNCHRONOUS) {
+ glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB);
}
}
+
+ /* Sync the gpu and cpu start times */
+ gpuTime = getGpuTimestamp();
+ cpuTime = getCpuTimestamp();
+ retrace::profiler.setBaseTimes(gpuTime, cpuTime);
}
void