diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-25 15:17:32 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-25 15:17:32 +0000 |
| commit | 2a05de0c049a8648942a55016126a1f92e1c14d6 (patch) | |
| tree | 19b23314177b75dd614c4e78a8b194199ddb9432 /src/gpu/gl/GrGpuGL.cpp | |
| parent | f2ef1587e4dcd50f17d1baa53558b525fe02a15a (diff) | |
Add Gpu Tracing to Ganesh
BUG=skia:2316
R=bsalomon@google.com, tomhudson@google.com
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/184443003
git-svn-id: http://skia.googlecode.com/svn/trunk@13936 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/GrGpuGL.cpp')
| -rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index 0aa072cd84..8c6145a567 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -2754,24 +2754,19 @@ bool GrGpuGL::onCanCopySurface(GrSurface* dst, return INHERITED::onCanCopySurface(dst, src, srcRect, dstPoint); } -void GrGpuGL::onInstantGpuTraceEvent(const char* marker) { +void GrGpuGL::didAddGpuTraceMarker() { if (this->caps()->gpuTracingSupport()) { - // GL_CALL(InsertEventMarker(0, marker)); + const GrTraceMarkerSet& markerArray = this->getActiveTraceMarkers(); + SkString markerString = markerArray.toString(); + GL_CALL(PushGroupMarker(0, markerString.c_str())); } } -void GrGpuGL::onPushGpuTraceEvent(const char* marker) { +void GrGpuGL::didRemoveGpuTraceMarker() { if (this->caps()->gpuTracingSupport()) { - // GL_CALL(PushGroupMarker(0, marker)); + GL_CALL(PopGroupMarker()); } } - -void GrGpuGL::onPopGpuTraceEvent() { - if (this->caps()->gpuTracingSupport()) { - // GL_CALL(PopGroupMarker()); - } -} - /////////////////////////////////////////////////////////////////////////////// GrGLAttribArrayState* GrGpuGL::HWGeometryState::bindArrayAndBuffersToDraw( |