| Index: src/gpu/gl/GrGpuGL.cpp
|
| diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp
|
| index c95edb740b2d17ef9ded9b6cd368d3c984d13cee..e8b31a1983b12fa73b62a8eb2011b13b2a952e19 100644
|
| --- a/src/gpu/gl/GrGpuGL.cpp
|
| +++ b/src/gpu/gl/GrGpuGL.cpp
|
| @@ -889,7 +889,7 @@ static GrTexture* return_null_texture() {
|
| return NULL;
|
| }
|
|
|
| -#if 0 && GR_DEBUG
|
| +#if 0 && SK_DEBUG
|
| static size_t as_size_t(int x) {
|
| return x;
|
| }
|
| @@ -1119,7 +1119,7 @@ bool GrGpuGL::attachStencilBufferToRenderTarget(GrStencilBuffer* sb, GrRenderTar
|
| GL_CALL(FramebufferRenderbuffer(GR_GL_FRAMEBUFFER,
|
| GR_GL_DEPTH_ATTACHMENT,
|
| GR_GL_RENDERBUFFER, 0));
|
| -#if GR_DEBUG
|
| +#if SK_DEBUG
|
| GrGLenum status;
|
| GL_CALL_RET(status, CheckFramebufferStatus(GR_GL_FRAMEBUFFER));
|
| SkASSERT(GR_GL_FRAMEBUFFER_COMPLETE == status);
|
| @@ -1539,7 +1539,7 @@ void GrGpuGL::flushRenderTarget(const SkIRect* bound) {
|
|
|
| if (fHWBoundRenderTarget != rt) {
|
| GL_CALL(BindFramebuffer(GR_GL_FRAMEBUFFER, rt->renderFBOID()));
|
| -#if GR_DEBUG
|
| +#if SK_DEBUG
|
| GrGLenum status;
|
| GL_CALL_RET(status, CheckFramebufferStatus(GR_GL_FRAMEBUFFER));
|
| if (status != GR_GL_FRAMEBUFFER_COMPLETE) {
|
|
|