Chromium Code Reviews| Index: src/gpu/gl/GrGpuGL.cpp |
| diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp |
| index 5fb268863b25a256113631ca3f06705e0024116a..a451acd1658139669203d6e4873bf226d8925042 100644 |
| --- a/src/gpu/gl/GrGpuGL.cpp |
| +++ b/src/gpu/gl/GrGpuGL.cpp |
| @@ -15,6 +15,8 @@ |
| #include "SkStrokeRec.h" |
| #include "SkTemplates.h" |
| +#include <stdio.h> |
| + |
| #define GL_CALL(X) GR_GL_CALL(this->glInterface(), X) |
| #define GL_CALL_RET(RET, X) GR_GL_CALL_RET(this->glInterface(), RET, X) |
| @@ -2661,24 +2663,21 @@ bool GrGpuGL::onCanCopySurface(GrSurface* dst, |
| return INHERITED::onCanCopySurface(dst, src, srcRect, dstPoint); |
| } |
| -void GrGpuGL::onInstantGpuTraceEvent(const char* marker) { |
| - if (this->caps()->gpuTracingSupport()) { |
| - // GL_CALL(InsertEventMarker(0, marker)); |
| - } |
| -} |
| - |
| -void GrGpuGL::onPushGpuTraceEvent(const char* marker) { |
| +void GrGpuGL::onAddGpuTraceMarker() { |
| if (this->caps()->gpuTracingSupport()) { |
| - // GL_CALL(PushGroupMarker(0, marker)); |
| + SkTDArray<GpuTraceMarker>* markerArray = this->getActiveTraceMarkers(); |
| + SkString markerString = getTraceString(markerArray, 0, markerArray->count()); |
| + //(void) markerString; |
| + printf("\n%s\n", markerString.c_str()); |
|
bsalomon
2014/03/17 17:50:38
I assume this is just leftover debugging stuff
egdaniel
2014/03/17 19:49:12
Yeah again a bunch of debug stuff throughout code
|
| + // GL_CALL(PushGroupMarker(0, markerString.c_str())); |
| } |
| } |
| -void GrGpuGL::onPopGpuTraceEvent() { |
| +void GrGpuGL::onRemoveGpuTraceMarker() { |
| if (this->caps()->gpuTracingSupport()) { |
| - // GL_CALL(PopGroupMarker()); |
| + //GL_CALL(PopGroupMarker()); |
| } |
| } |
| - |
| /////////////////////////////////////////////////////////////////////////////// |
| GrGLAttribArrayState* GrGpuGL::HWGeometryState::bindArrayAndBuffersToDraw( |