LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 835aef2c: Merge "emulator: opengl: Fix Mac and Windows builds."

Browse Source 
* commit '835aef2ce8f1e63454868471d5184a13f8b2415b':
  emulator: opengl: Fix Mac and Windows builds.
This commit is contained in:
David Turner
2011-05-03 12:55:11 -07:00
committed by Android Git Automerger
parent 2076f0fd16 835aef2ce8
commit 11540e0aaf
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/emulator/opengl/host/libs/Translator/EGL/EglMacApi.cpp
View File

@@ -33,11 +33,11 @@ EglConfig* pixelFormatToConfig(EGLNativeDisplayType dpy,EGLNativePixelFormatType
void queryConfigs(EGLNativeDisplayType dpy,ConfigsList& listOut) { void queryConfigs(EGLNativeDisplayType dpy,ConfigsList& listOut) {
} }
bool validNativeWin(EGLNativeWindowType win) { bool validNativeWin(EGLNativeDisplayType dpy, EGLNativeWindowType win) {
return true; return true;
} }
bool validNativePixmap(EGLNativePixmapType pix) { bool validNativePixmap(EGLNativeDisplayType dpy, EGLNativePixmapType pix) {
return true; return true;
} }

4
tools/emulator/opengl/host/libs/Translator/EGL/EglWindowsApi.cpp
View File

@@ -114,11 +114,11 @@ void queryConfigs(EGLNativeDisplayType dpy,ConfigList& listOut) {
} }
bool validNativeWin(EGLNativeWindowType win) { bool validNativeWin(EGLNativeDisplayType dpy, EGLNativeWindowType win) {
return IsWindow(win); return IsWindow(win);
} }
bool validNativePixmap(EGLNativePixmapType pix) { bool validNativePixmap(EGLNativeDisplayType dpy, EGLNativePixmapType pix) {
BITMAP bm; BITMAP bm;
return GetObject(pix, sizeof(BITMAP), (LPSTR)&bm); return GetObject(pix, sizeof(BITMAP), (LPSTR)&bm);
} }

2
tools/emulator/opengl/tests/gles_android_wrapper/CleanSpec.mk
View File

@@ -47,4 +47,4 @@
# ************************************************ # ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************ # ************************************************
$(call add-clean-stepp, rm -rf $(OUT_DIR)/target/common/obj/SHARED_LIBRARIES/libGLES_emul_intermediates) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/SHARED_LIBRARIES/libGLES_emul_intermediates)