Enable WebKit/Chromium style logging for Skia.
New macros called in Ganesh functions; by default are compiled away,
in example code resolve to printout, and are compatible with WebKit/Chromium
event logging and GPU profiler.
git-svn-id: http://skia.googlecode.com/svn/trunk@1770 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gpu/src/GrContext.cpp b/gpu/src/GrContext.cpp
index a2b2a16..d97974a 100644
--- a/gpu/src/GrContext.cpp
+++ b/gpu/src/GrContext.cpp
@@ -14,17 +14,18 @@
limitations under the License.
*/
+#include "GrBufferAllocPool.h"
+#include "GrClipIterator.h"
#include "GrContext.h"
#include "GrGpu.h"
-#include "GrTextureCache.h"
-#include "GrTextStrike.h"
-#include "GrMemory.h"
-#include "GrClipIterator.h"
#include "GrIndexBuffer.h"
#include "GrInOrderDrawBuffer.h"
-#include "GrBufferAllocPool.h"
+#include "GrMemory.h"
#include "GrPathRenderer.h"
#include "GrPathUtils.h"
+#include "GrTextureCache.h"
+#include "GrTextStrike.h"
+#include SK_USER_TRACE_INCLUDE_FILE
// Using MSAA seems to be slower for some yet unknown reason.
#define PREFER_MSAA_OFFSCREEN_AA 0
@@ -203,6 +204,7 @@
const GrSamplerState& sampler,
const GrTextureDesc& desc,
void* srcData, size_t rowBytes) {
+ SK_TRACE_EVENT0("GrContext::createAndLockTexture");
GrAssert(key->width() == desc.fWidth);
GrAssert(key->height() == desc.fHeight);
@@ -712,7 +714,7 @@
const GrIRect& boundRect,
int tileX, int tileY,
OffscreenRecord* record) {
-
+ SK_TRACE_EVENT0("GrContext::doOffscreenAAPass2");
GrAssert(NULL != record->fEntry0);
GrIRect tileRect;
@@ -928,7 +930,6 @@
void GrContext::fillAARect(GrDrawTarget* target,
const GrPaint& paint,
const GrRect& devRect) {
-
GrVertexLayout layout = PaintStageVertexLayoutBits(paint, NULL) |
GrDrawTarget::kColor_VertexLayoutBit;
@@ -1084,7 +1085,7 @@
const GrRect& rect,
GrScalar width,
const GrMatrix* matrix) {
-
+ SK_TRACE_EVENT0("GrContext::drawRect");
GrDrawTarget* target = this->prepareToDraw(paint, kUnbuffered_DrawCategory);
int stageMask = paint.getActiveStageMask();
@@ -1190,6 +1191,7 @@
const GrRect& srcRect,
const GrMatrix* dstMatrix,
const GrMatrix* srcMatrix) {
+ SK_TRACE_EVENT0("GrContext::drawRectToRect");
// srcRect refers to paint's first texture
if (NULL == paint.getTexture(0)) {
@@ -1258,6 +1260,7 @@
const GrColor colors[],
const uint16_t indices[],
int indexCount) {
+ SK_TRACE_EVENT0("GrContext::drawVertices");
GrDrawTarget::AutoReleaseGeometry geo;
@@ -1426,6 +1429,7 @@
bool GrContext::readTexturePixels(GrTexture* texture,
int left, int top, int width, int height,
GrPixelConfig config, void* buffer) {
+ SK_TRACE_EVENT0("GrContext::readTexturePixels");
// TODO: code read pixels for textures that aren't rendertargets
@@ -1443,6 +1447,7 @@
bool GrContext::readRenderTargetPixels(GrRenderTarget* target,
int left, int top, int width, int height,
GrPixelConfig config, void* buffer) {
+ SK_TRACE_EVENT0("GrContext::readRenderTargetPixels");
uint32_t flushFlags = 0;
if (NULL == target) {
flushFlags |= GrContext::kForceCurrentRenderTarget_FlushBit;
@@ -1457,6 +1462,7 @@
void GrContext::writePixels(int left, int top, int width, int height,
GrPixelConfig config, const void* buffer,
size_t stride) {
+ SK_TRACE_EVENT0("GrContext::writePixels");
// TODO: when underlying api has a direct way to do this we should use it
// (e.g. glDrawPixels on desktop GL).
diff --git a/gpu/src/GrGLProgram.cpp b/gpu/src/GrGLProgram.cpp
index b0d41aa..319995c 100644
--- a/gpu/src/GrGLProgram.cpp
+++ b/gpu/src/GrGLProgram.cpp
@@ -21,6 +21,7 @@
#include "GrMemory.h"
#include "SkXfermode.h"
+#include SK_USER_TRACE_INCLUDE_FILE
namespace {
@@ -758,6 +759,9 @@
int stringCnt,
const char** strings,
int* stringLengths) {
+ SK_TRACE_EVENT1("GrGLProgram::CompileShader",
+ "stringCount", SkStringPrintf("%i", stringCnt).c_str());
+
GrGLuint shader = GR_GL(CreateShader(type));
if (0 == shader) {
return 0;
diff --git a/gpu/src/GrPathRenderer.cpp b/gpu/src/GrPathRenderer.cpp
index 1795bd4..b565838 100644
--- a/gpu/src/GrPathRenderer.cpp
+++ b/gpu/src/GrPathRenderer.cpp
@@ -6,6 +6,9 @@
#include "GrMemory.h"
#include "GrTexture.h"
+#include "SkString.h"
+#include SK_USER_TRACE_INCLUDE_FILE
+
GrPathRenderer::GrPathRenderer()
: fCurveTolerance (GR_Scalar1) {
@@ -191,6 +194,8 @@
GrPathFill fill,
const GrPoint* translate,
bool stencilOnly) {
+ SK_TRACE_EVENT1("GrDefaultPathRenderer::onDrawPath",
+ "points", SkStringPrintf("%i", path.countPoints()).c_str());
GrDrawTarget::AutoStateRestore asr(target);
bool colorWritesWereDisabled = target->isColorWriteDisabled();
@@ -334,7 +339,10 @@
SkPath::Iter iter(path, false);
+ {
+ SK_TRACE_EVENT0("GrDefaultPathRenderer::onDrawPath::assembleVerts");
for (;;) {
+
GrPathCmd cmd = (GrPathCmd)iter.next(pts);
switch (cmd) {
case kMove_PathCmd:
@@ -371,6 +379,7 @@
}
first = false;
}
+ }
FINISHED:
GrAssert(subpath == subpathCnt);
GrAssert((vert - base) <= maxPts);
@@ -406,6 +415,9 @@
bounds.fBottom);
}
+ {
+ SK_TRACE_EVENT1("GrDefaultPathRenderer::onDrawPath::renderPasses",
+ "verts", SkStringPrintf("%i", vert - base).c_str());
for (int p = 0; p < passCount; ++p) {
target->setDrawFace(drawFace[p]);
if (NULL != passes[p]) {
@@ -432,6 +444,7 @@
}
}
}
+ }
}
void GrDefaultPathRenderer::drawPath(GrDrawTarget* target,