From 338af41a48df4eee77908b9036a6b49b3dc4e36d Mon Sep 17 00:00:00 2001 From: "gman@chromium.org" Date: Sat, 4 Aug 2012 09:15:22 +0000 Subject: make egl_native.cc compile on OSX No idea why this doesn't work sometimes. It works for me but not for others. Maybe which verison of XCode? BUG=83382 Review URL: https://chromiumcodereview.appspot.com/10826152 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150029 0039d316-1c4b-4281-b951-d872f2087c98 --- gpu/gles2_conform_support/native/egl_native.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gpu/gles2_conform_support/native/egl_native.cc b/gpu/gles2_conform_support/native/egl_native.cc index 0a3e6d4..bf8c771 100644 --- a/gpu/gles2_conform_support/native/egl_native.cc +++ b/gpu/gles2_conform_support/native/egl_native.cc @@ -23,14 +23,14 @@ void GTFNativeDestroyPixmap(EGLNativeDisplayType nativeDisplay, EGLImageKHR GTFCreateEGLImageExternal( int width, int height, int format, float r, float g, float b, float a, void** resource) { - return (EGLImageKHR)NULL; + return (EGLImageKHR)0; } void GTFDestroyEGLImageExternal(EGLImageKHR image, void* resource) { } const int* GTFQueryFormatsEGLImageExternal(void) { - return NULL; + return 0; } GTFbool GTFIsAlphaFormatEGLImageExternal(int format) { -- cgit v1.1