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

am 9ae79d86: Build fix for size_t on 64bit.

Browse Source 
* commit '9ae79d869a37633fa956a4f16f3fa45b23c189f1':
  Build fix for size_t on 64bit.
This commit is contained in:
Michael Lentine 2014-07-30 23:51:11 +00:00 committed by Android Git Automerger
commit 45500a2512
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
services/surfaceflinger/RenderEngine/RenderEngine.cpp
View File

@ -139,8 +139,8 @@ RenderEngine* RenderEngine::create(EGLDisplay display, int hwcFormat) {
ALOGI("renderer : %s", extensions.getRenderer()); ALOGI("renderer : %s", extensions.getRenderer());
ALOGI("version : %s", extensions.getVersion()); ALOGI("version : %s", extensions.getVersion());
ALOGI("extensions: %s", extensions.getExtension()); ALOGI("extensions: %s", extensions.getExtension());
ALOGI("GL_MAX_TEXTURE_SIZE = %d", engine->getMaxTextureSize()); ALOGI("GL_MAX_TEXTURE_SIZE = %zu", engine->getMaxTextureSize());
ALOGI("GL_MAX_VIEWPORT_DIMS = %d", engine->getMaxViewportDims()); ALOGI("GL_MAX_VIEWPORT_DIMS = %zu", engine->getMaxViewportDims());
eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
eglDestroySurface(display, dummy); eglDestroySurface(display, dummy);

2
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -640,7 +640,7 @@ status_t SurfaceFlinger::setActiveConfig(const sp<IBinder>& display, int mode) {
Vector<DisplayInfo> configs; Vector<DisplayInfo> configs;
mFlinger.getDisplayConfigs(mDisplay, &configs); mFlinger.getDisplayConfigs(mDisplay, &configs);
if(mMode < 0 || mMode >= configs.size()) { if(mMode < 0 || mMode >= configs.size()) {
ALOGE("Attempt to set active config = %d for display with %d configs", ALOGE("Attempt to set active config = %d for display with %zu configs",
mMode, configs.size()); mMode, configs.size());
} }
sp<DisplayDevice> hw(mFlinger.getDisplayDevice(mDisplay)); sp<DisplayDevice> hw(mFlinger.getDisplayDevice(mDisplay));