diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-10-31 22:17:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-31 22:17:25 +0000 |
| commit | 363a70bcd4f1dbde18868a236e556edcd775ce3d (patch) | |
| tree | be9900aea988082adaf61d6c0a4dbe0fe80cf4e8 /opengl | |
| parent | 54284eb63c164d924f39f15086e55c65d8e6833f (diff) | |
| parent | 3fe2263e2429a0611796e3e84c6f8b54bc30aa48 (diff) | |
| download | android_device_generic_goldfish-363a70bcd4f1dbde18868a236e556edcd775ce3d.tar.gz android_device_generic_goldfish-363a70bcd4f1dbde18868a236e556edcd775ce3d.tar.bz2 android_device_generic_goldfish-363a70bcd4f1dbde18868a236e556edcd775ce3d.zip | |
am 3fe2263e: Merge "opengl: Fix 64-bit build."
* commit '3fe2263e2429a0611796e3e84c6f8b54bc30aa48':
opengl: Fix 64-bit build.
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/system/egl/egl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/opengl/system/egl/egl.cpp b/opengl/system/egl/egl.cpp index 7ff7429..1ad91ff 100644 --- a/opengl/system/egl/egl.cpp +++ b/opengl/system/egl/egl.cpp @@ -554,9 +554,9 @@ EGLBoolean eglGetConfigs(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, return EGL_TRUE; } - EGLint i=0; - for (i=0 ; i<numConfigs && i<config_size ; i++) { - *configs++ = (EGLConfig)i; + EGLint i; + for (i = 0 ; i < numConfigs && i < config_size ; i++) { + *configs++ = (EGLConfig)(uintptr_t)i; } *num_config = i; return EGL_TRUE; |