diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-25 20:57:51 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-09-25 20:57:51 +0000 |
| commit | 4382330a15e13b9ef54010606eb758c0c66e1868 (patch) | |
| tree | e5bab5f330c839d95552cb5c67d0ffb891e628f7 /src/gpu | |
| parent | 7d9a21bb362a7c8d1689d83c1fc24c0c7db64923 (diff) | |
Replace GR_*_BUILD by their SK_BUILD_FOR_* equivalents.
BUG=None
TEST=None, no functional changes.
R=bsalomon@google.com, robertphillips@google.com
Author: tfarina@chromium.org
Review URL: https://chromiumcodereview.appspot.com/24253009
git-svn-id: http://skia.googlecode.com/svn/trunk@11457 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrContext.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/gl/GrGpuGL.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp index e62aa5d648..9dfe761024 100644 --- a/src/gpu/GrContext.cpp +++ b/src/gpu/GrContext.cpp @@ -1487,7 +1487,7 @@ bool GrContext::writeRenderTargetPixels(GrRenderTarget* target, // We expect to be at least as fast or faster since it doesn't use an intermediate texture as // we do below. -#if !GR_MAC_BUILD +#if !defined(SK_BUILD_FOR_MAC) // At least some drivers on the Mac get confused when glTexImage2D is called on a texture // attached to an FBO. The FBO still sees the old image. TODO: determine what OS versions and/or // HW is affected. diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp index 6f9a8ab152..d1a716793f 100644 --- a/src/gpu/gl/GrGpuGL.cpp +++ b/src/gpu/gl/GrGpuGL.cpp @@ -1604,9 +1604,9 @@ GrGLenum gPrimitiveType2GLMode[] = { #define SWAP_PER_DRAW 0 #if SWAP_PER_DRAW - #if GR_MAC_BUILD + #if defined(SK_BUILD_FOR_MAC) #include <AGL/agl.h> - #elif GR_WIN32_BUILD + #elif defined(SK_BUILD_FOR_WIN32) #include <gl/GL.h> void SwapBuf() { DWORD procID = GetCurrentProcessId(); @@ -1645,11 +1645,11 @@ void GrGpuGL::onGpuDraw(const DrawInfo& info) { } #if SWAP_PER_DRAW glFlush(); - #if GR_MAC_BUILD + #if defined(SK_BUILD_FOR_MAC) aglSwapBuffers(aglGetCurrentContext()); int set_a_break_pt_here = 9; aglSwapBuffers(aglGetCurrentContext()); - #elif GR_WIN32_BUILD + #elif defined(SK_BUILD_FOR_WIN32) SwapBuf(); int set_a_break_pt_here = 9; SwapBuf(); |