diff options
| author |  tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-07-01 17:08:26 +0000 |
|---|---|---|
| committer | tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-07-01 17:08:26 +0000 |
| commit | 0c8d93a94099dee2dff8da6000ded9ad59676488 (patch) | |
| tree | 93d68d568132740aef280b4badcf5edb90ce8b7f /gpu | |
| parent | 9ae4429f9d3ab837ff9352261271974715cabb8a (diff) | |
Reworks r1770 so that users who have replaced SkUserConfig don't have to
make any changes to continue compiling successfully.
git-svn-id: http://skia.googlecode.com/svn/trunk@1779 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/src/GrContext.cpp | 2 | ||||
| -rw-r--r-- | gpu/src/GrGLProgram.cpp | 2 | ||||
| -rw-r--r-- | gpu/src/GrPathRenderer.cpp | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/gpu/src/GrContext.cpp b/gpu/src/GrContext.cpp index eee73d9554..b75c917dcb 100644 --- a/gpu/src/GrContext.cpp +++ b/gpu/src/GrContext.cpp @@ -24,7 +24,7 @@ #include "GrPathUtils.h" #include "GrTextureCache.h" #include "GrTextStrike.h" -#include SK_USER_TRACE_INCLUDE_FILE +#include "SkTrace.h" // Using MSAA seems to be slower for some yet unknown reason. #define PREFER_MSAA_OFFSCREEN_AA 0 diff --git a/gpu/src/GrGLProgram.cpp b/gpu/src/GrGLProgram.cpp index 733e70599d..31571ab597 100644 --- a/gpu/src/GrGLProgram.cpp +++ b/gpu/src/GrGLProgram.cpp @@ -19,8 +19,8 @@ #include "GrBinHashKey.h" #include "GrGLConfig.h" +#include "SkTrace.h" #include "SkXfermode.h" -#include SK_USER_TRACE_INCLUDE_FILE namespace { diff --git a/gpu/src/GrPathRenderer.cpp b/gpu/src/GrPathRenderer.cpp index b103880d21..61670daa98 100644 --- a/gpu/src/GrPathRenderer.cpp +++ b/gpu/src/GrPathRenderer.cpp @@ -7,8 +7,7 @@ #include "SkString.h" #include "SkTemplates.h" - -#include SK_USER_TRACE_INCLUDE_FILE +#include "SkTrace.h" GrPathRenderer::GrPathRenderer() : fCurveTolerance (GR_Scalar1) |