Merge "Make libEGL build cleanly under 64-bit"
This commit is contained in:
commit
851b2cb18c
@ -27,7 +27,6 @@
|
||||
#include <cutils/log.h>
|
||||
#include <cutils/atomic.h>
|
||||
#include <cutils/properties.h>
|
||||
#include <cutils/memory.h>
|
||||
|
||||
#include <utils/CallStack.h>
|
||||
#include <utils/String8.h>
|
||||
@ -42,6 +41,8 @@
|
||||
#include "egl_display.h"
|
||||
#include "egl_object.h"
|
||||
|
||||
typedef __eglMustCastToProperFunctionPointerType EGLFuncPointer;
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
namespace android {
|
||||
// ----------------------------------------------------------------------------
|
||||
@ -234,11 +235,11 @@ static void early_egl_init(void)
|
||||
pthread_key_create(&gGLTraceKey, NULL);
|
||||
initEglTraceLevel();
|
||||
#endif
|
||||
uint32_t addr = (uint32_t)((void*)gl_no_context);
|
||||
android_memset32(
|
||||
(uint32_t*)(void*)&gHooksNoContext,
|
||||
addr,
|
||||
sizeof(gHooksNoContext));
|
||||
int numHooks = sizeof(gHooksNoContext) / sizeof(EGLFuncPointer);
|
||||
EGLFuncPointer *iter = reinterpret_cast<EGLFuncPointer*>(&gHooksNoContext);
|
||||
for (int hook = 0; hook < numHooks; ++hook) {
|
||||
*(iter++) = reinterpret_cast<EGLFuncPointer>(gl_no_context);
|
||||
}
|
||||
|
||||
setGLHooksThreadSpecific(&gHooksNoContext);
|
||||
}
|
||||
|
@ -204,7 +204,7 @@ EGLDisplay eglGetDisplay(EGLNativeDisplayType display)
|
||||
{
|
||||
clearError();
|
||||
|
||||
uint32_t index = uint32_t(display);
|
||||
uintptr_t index = reinterpret_cast<uintptr_t>(display);
|
||||
if (index >= NUM_DISPLAYS) {
|
||||
return setError(EGL_BAD_PARAMETER, EGL_NO_DISPLAY);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user