AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove mutual dependency of gr and skgr.

Browse Source 
http://codereview.appspot.com/5879043/


git-svn-id: http://skia.googlecode.com/svn/trunk@3467 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bungeman@google.com 2012-03-22 17:56:29 +00:00
parent c62923d6ad
commit f85abda8c9
4 changed files with 1 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gyp/gpu.gyp
View File

@ -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',

2
include/gpu/GrConfig.h
View File

@ -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

29
src/gpu/GrPrintf_printf.cpp
View File

@ -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 <stdarg.h>
#include <stdio.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);
printf("%s", buffer);
}

32
src/gpu/GrPrintf_skia.cpp
View File

@ -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 <stdarg.h>
#include <stdio.h>
#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);
}