diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp index a4d7c18db..db506d70a 100644 --- a/gyp/gpu.gyp +++ b/gyp/gpu.gyp @@ -104,7 +104,6 @@ '../include/gpu/gl/SkNullGLContext.h', '../include/gpu/gl/SkDebugGLContext.h', - '../src/gpu/GrPrintf_skia.cpp', '../src/gpu/SkGpuCanvas.cpp', '../src/gpu/SkGpuDevice.cpp', '../src/gpu/SkGr.cpp', diff --git a/include/gpu/GrConfig.h b/include/gpu/GrConfig.h index 1dfe199f7..e25859be2 100644 --- a/include/gpu/GrConfig.h +++ b/include/gpu/GrConfig.h @@ -182,7 +182,7 @@ typedef unsigned __int64 uint64_t; // debug -vs- release // -extern GR_API void GrPrintf(const char format[], ...); +#define GrPrintf SkDebugf /** * GR_STRING makes a string of X where X is expanded before conversion to a string diff --git a/src/gpu/GrPrintf_printf.cpp b/src/gpu/GrPrintf_printf.cpp deleted file mode 100644 index 909a4f0a6..000000000 --- a/src/gpu/GrPrintf_printf.cpp +++ /dev/null @@ -1,29 +0,0 @@ - -/* - * Copyright 2010 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - - - -#include "GrTypes.h" - -#include -#include - -void GrPrintf(const char format[], ...) { - const size_t MAX_BUFFER_SIZE = 2048; - - char buffer[MAX_BUFFER_SIZE + 1]; - va_list args; - - va_start(args, format); - vsnprintf(buffer, MAX_BUFFER_SIZE, format, args); - va_end(args); - - printf("%s", buffer); -} - - diff --git a/src/gpu/GrPrintf_skia.cpp b/src/gpu/GrPrintf_skia.cpp deleted file mode 100644 index 9bab4193d..000000000 --- a/src/gpu/GrPrintf_skia.cpp +++ /dev/null @@ -1,32 +0,0 @@ - -/* - * Copyright 2010 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - - - -#include "GrTypes.h" - -#include -#include - -#include "SkTypes.h" - -void GrPrintf(const char format[], ...) { - const size_t MAX_BUFFER_SIZE = 2048; - - char buffer[MAX_BUFFER_SIZE + 1]; - va_list args; - - va_start(args, format); - vsnprintf(buffer, MAX_BUFFER_SIZE, format, args); - va_end(args); - - // skia has already mapped this to do the "right thing" - SkDebugf("%s", buffer); -} - -