ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

am 689a7f30: am 851b2cb1: Merge "Make libEGL build cleanly under 64-bit"

Browse Source 
* commit '689a7f30ccd2e57eaadecedbe30690e2a44ce23a':
  Make libEGL build cleanly under 64-bit
This commit is contained in:
Colin Cross 2014-01-28 02:29:37 +00:00 committed by Android Git Automerger
commit 0da82a6f0d
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
opengl/libs/EGL/egl.cpp
View File

@ -27,7 +27,6 @@
#include <cutils/log.h> #include <cutils/log.h>
#include <cutils/atomic.h> #include <cutils/atomic.h>
#include <cutils/properties.h> #include <cutils/properties.h>
#include <cutils/memory.h>
#include <utils/CallStack.h> #include <utils/CallStack.h>
#include <utils/String8.h> #include <utils/String8.h>
@ -42,6 +41,8 @@
#include "egl_display.h" #include "egl_display.h"
#include "egl_object.h" #include "egl_object.h"
typedef __eglMustCastToProperFunctionPointerType EGLFuncPointer;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
namespace android { namespace android {
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -234,11 +235,11 @@ static void early_egl_init(void)
pthread_key_create(&gGLTraceKey, NULL); pthread_key_create(&gGLTraceKey, NULL);
initEglTraceLevel(); initEglTraceLevel();
#endif #endif
uint32_t addr = (uint32_t)((void*)gl_no_context); int numHooks = sizeof(gHooksNoContext) / sizeof(EGLFuncPointer);
android_memset32( EGLFuncPointer *iter = reinterpret_cast<EGLFuncPointer*>(&gHooksNoContext);
(uint32_t*)(void*)&gHooksNoContext, for (int hook = 0; hook < numHooks; ++hook) {
addr, *(iter++) = reinterpret_cast<EGLFuncPointer>(gl_no_context);
sizeof(gHooksNoContext)); }
setGLHooksThreadSpecific(&gHooksNoContext); setGLHooksThreadSpecific(&gHooksNoContext);
} }

2
opengl/libs/EGL/eglApi.cpp
View File

@ -204,7 +204,7 @@ EGLDisplay eglGetDisplay(EGLNativeDisplayType display)
{ {
clearError(); clearError();
uint32_t index = uint32_t(display); uintptr_t index = reinterpret_cast<uintptr_t>(display);
if (index >= NUM_DISPLAYS) { if (index >= NUM_DISPLAYS) {
return setError(EGL_BAD_PARAMETER, EGL_NO_DISPLAY); return setError(EGL_BAD_PARAMETER, EGL_NO_DISPLAY);
} }