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

GCC 4.6 fix: intptr_t <-> NULL triggers an warning.

Browse Source 
BUG=chromium:87001
TEST=none

Patch by Ryan Sleevi <rsleevi@chromium.org>
Review URL: http://codereview.appspot.com/4571048/

git-svn-id: http://skia.googlecode.com/svn/trunk@1538 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
thakis@chromium.org 2011-06-07 22:18:07 +00:00
parent be9ad4e5fc
commit 7e12f82aa4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gpu/src/GrContext.cpp
View File

@ -57,7 +57,7 @@ GrContext* GrContext::Create(GrEngine engine,
}
GrContext* GrContext::CreateGLShaderContext() {
return GrContext::Create(kOpenGL_Shaders_GrEngine, NULL);
return GrContext::Create(kOpenGL_Shaders_GrEngine, 0);
}
GrContext::~GrContext() {

4
gpu/src/app-android.cpp
View File

@ -14,8 +14,8 @@
static GrContext* make_context() {
SkDebugf("---- before create\n");
GrContext* ctx = GrContext::Create(GrGpu::kOpenGL_Shaders_Engine, NULL);
// GrContext* ctx = GrContext::Create(GrGpu::kOpenGL_Fixed_Engine, NULL);
GrContext* ctx = GrContext::Create(GrGpu::kOpenGL_Shaders_Engine, 0);
// GrContext* ctx = GrContext::Create(GrGpu::kOpenGL_Fixed_Engine, 0);
SkDebugf("---- after create %p\n", ctx);
return ctx;
}

4
gpu/src/skia/SkUIView.mm
View File

@ -362,9 +362,9 @@ static GrContext* get_global_grctx() {
// should be pthread-local at least
if (NULL == gCtx) {
#ifdef USE_GL_1
gCtx = GrContext::Create(GrGpu::kOpenGL_Fixed_Engine, NULL);
gCtx = GrContext::Create(GrGpu::kOpenGL_Fixed_Engine, 0);
#else
gCtx = GrContext::Create(GrGpu::kOpenGL_Shaders_Engine, NULL);
gCtx = GrContext::Create(GrGpu::kOpenGL_Shaders_Engine, 0);
#endif
}
return gCtx;