am 5b675210: Merge "emulator opengl: use eglGetProcAddress in EGL dispatch."

* commit '5b675210ed267a859e0c98794844fa87626f7505':
  emulator opengl: use eglGetProcAddress in EGL dispatch.
This commit is contained in:
David Turner
2011-06-21 11:30:39 -07:00
committed by Android Git Automerger

View File

@@ -65,16 +65,21 @@ bool init_egl_dispatch()
s_egl.eglSwapBuffers = (eglSwapBuffers_t) lib->findSymbol("eglSwapBuffers"); s_egl.eglSwapBuffers = (eglSwapBuffers_t) lib->findSymbol("eglSwapBuffers");
s_egl.eglCopyBuffers = (eglCopyBuffers_t) lib->findSymbol("eglCopyBuffers"); s_egl.eglCopyBuffers = (eglCopyBuffers_t) lib->findSymbol("eglCopyBuffers");
s_egl.eglGetProcAddress = (eglGetProcAddress_t) lib->findSymbol("eglGetProcAddress"); s_egl.eglGetProcAddress = (eglGetProcAddress_t) lib->findSymbol("eglGetProcAddress");
s_egl.eglLockSurfaceKHR = (eglLockSurfaceKHR_t) lib->findSymbol("eglLockSurfaceKHR");
s_egl.eglUnlockSurfaceKHR = (eglUnlockSurfaceKHR_t) lib->findSymbol("eglUnlockSurfaceKHR"); #define INIT_EGL_EXT_FUNC(name) \
s_egl.eglCreateImageKHR = (eglCreateImageKHR_t) lib->findSymbol("eglCreateImageKHR"); if (s_egl.eglGetProcAddress) s_egl.name = (name ## _t) s_egl.eglGetProcAddress(#name); \
s_egl.eglDestroyImageKHR = (eglDestroyImageKHR_t) lib->findSymbol("eglDestroyImageKHR"); if (!s_egl.name || !s_egl.eglGetProcAddress) s_egl.name = (name ## _t) lib->findSymbol(#name)
s_egl.eglCreateSyncKHR = (eglCreateSyncKHR_t) lib->findSymbol("eglCreateSyncKHR");
s_egl.eglDestroySyncKHR = (eglDestroySyncKHR_t) lib->findSymbol("eglDestroySyncKHR"); INIT_EGL_EXT_FUNC(eglLockSurfaceKHR);
s_egl.eglClientWaitSyncKHR = (eglClientWaitSyncKHR_t) lib->findSymbol("eglClientWaitSyncKHR"); INIT_EGL_EXT_FUNC(eglUnlockSurfaceKHR);
s_egl.eglSignalSyncKHR = (eglSignalSyncKHR_t) lib->findSymbol("eglSignalSyncKHR"); INIT_EGL_EXT_FUNC(eglCreateImageKHR);
s_egl.eglGetSyncAttribKHR = (eglGetSyncAttribKHR_t) lib->findSymbol("eglGetSyncAttribKHR"); INIT_EGL_EXT_FUNC(eglDestroyImageKHR);
s_egl.eglSetSwapRectangleANDROID = (eglSetSwapRectangleANDROID_t) lib->findSymbol("eglSetSwapRectangleANDROID"); INIT_EGL_EXT_FUNC(eglCreateSyncKHR);
INIT_EGL_EXT_FUNC(eglDestroySyncKHR);
INIT_EGL_EXT_FUNC(eglClientWaitSyncKHR);
INIT_EGL_EXT_FUNC(eglSignalSyncKHR);
INIT_EGL_EXT_FUNC(eglGetSyncAttribKHR);
INIT_EGL_EXT_FUNC(eglSetSwapRectangleANDROID);
return true; return true;
} }