diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-06-10 18:14:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-06-10 18:14:01 +0000 |
| commit | e57726b9a50c3437338b65d8d3ac2a972604b8c2 (patch) | |
| tree | fc2cb215861c3b1ba98944b193d94803caa0b338 /emulator/opengl | |
| parent | af7533ccaae1c8decade28ff58be9df4ed5ef7af (diff) | |
| parent | 3e924260e43a43057196e98976a5c4643eb7a480 (diff) | |
| download | sdk-e57726b9a50c3437338b65d8d3ac2a972604b8c2.zip sdk-e57726b9a50c3437338b65d8d3ac2a972604b8c2.tar.gz sdk-e57726b9a50c3437338b65d8d3ac2a972604b8c2.tar.bz2 | |
Merge "emulator/opengl: Fix GPU emulation library crash on Windows." into idea133
automerge: 3e92426
* commit '3e924260e43a43057196e98976a5c4643eb7a480':
emulator/opengl: Fix GPU emulation library crash on Windows.
Diffstat (limited to 'emulator/opengl')
| -rw-r--r-- | emulator/opengl/host/libs/Translator/EGL/EglImp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/emulator/opengl/host/libs/Translator/EGL/EglImp.cpp b/emulator/opengl/host/libs/Translator/EGL/EglImp.cpp index 58180ed..8896698 100644 --- a/emulator/opengl/host/libs/Translator/EGL/EglImp.cpp +++ b/emulator/opengl/host/libs/Translator/EGL/EglImp.cpp @@ -1022,7 +1022,7 @@ void detachEGLImage(unsigned int imageId) } -EGLImageKHR eglCreateImageKHR(EGLDisplay display, EGLContext context, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list) +EGLAPI EGLImageKHR EGLAPIENTRY eglCreateImageKHR(EGLDisplay display, EGLContext context, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list) { VALIDATE_DISPLAY(display); VALIDATE_CONTEXT(context); @@ -1059,7 +1059,7 @@ EGLImageKHR eglCreateImageKHR(EGLDisplay display, EGLContext context, EGLenum ta } -EGLBoolean eglDestroyImageKHR(EGLDisplay display, EGLImageKHR image) +EGLAPI EGLBoolean EGLAPIENTRY eglDestroyImageKHR(EGLDisplay display, EGLImageKHR image) { VALIDATE_DISPLAY(display); return dpy->destroyImageKHR(image) ? EGL_TRUE:EGL_FALSE; |