diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-04 09:15:22 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-04 09:15:22 +0000 |
| commit | 338af41a48df4eee77908b9036a6b49b3dc4e36d (patch) | |
| tree | 51691e8d7f0b5b18d3889f537ee8dd99403d27e9 | |
| parent | 730ec10a15f97c1f15a3337e46b59cbd45bff6ee (diff) | |
| download | chromium_src-338af41a48df4eee77908b9036a6b49b3dc4e36d.zip chromium_src-338af41a48df4eee77908b9036a6b49b3dc4e36d.tar.gz chromium_src-338af41a48df4eee77908b9036a6b49b3dc4e36d.tar.bz2 | |
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
| -rw-r--r-- | gpu/gles2_conform_support/native/egl_native.cc | 4 |
1 files 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) { |