From fdd5607a6d802f75dc744c980326ca8d118e91f3 Mon Sep 17 00:00:00 2001 From: David Turner Date: Tue, 3 May 2011 18:29:27 +0200 Subject: [PATCH] emulator: opengl: Fix Mac and Windows builds. + Fix typo in clean step. Change-Id: I1da8b17a167247d252b5e8519832b042c2db3ccd --- tools/emulator/opengl/host/libs/Translator/EGL/EglMacApi.cpp | 4 ++-- .../opengl/host/libs/Translator/EGL/EglWindowsApi.cpp | 4 ++-- tools/emulator/opengl/tests/gles_android_wrapper/CleanSpec.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/emulator/opengl/host/libs/Translator/EGL/EglMacApi.cpp b/tools/emulator/opengl/host/libs/Translator/EGL/EglMacApi.cpp index 327588cd4..041309b5f 100644 --- a/tools/emulator/opengl/host/libs/Translator/EGL/EglMacApi.cpp +++ b/tools/emulator/opengl/host/libs/Translator/EGL/EglMacApi.cpp @@ -33,11 +33,11 @@ EglConfig* pixelFormatToConfig(EGLNativeDisplayType dpy,EGLNativePixelFormatType void queryConfigs(EGLNativeDisplayType dpy,ConfigsList& listOut) { } -bool validNativeWin(EGLNativeWindowType win) { +bool validNativeWin(EGLNativeDisplayType dpy, EGLNativeWindowType win) { return true; } -bool validNativePixmap(EGLNativePixmapType pix) { +bool validNativePixmap(EGLNativeDisplayType dpy, EGLNativePixmapType pix) { return true; } diff --git a/tools/emulator/opengl/host/libs/Translator/EGL/EglWindowsApi.cpp b/tools/emulator/opengl/host/libs/Translator/EGL/EglWindowsApi.cpp index bd642b550..f8edfe196 100644 --- a/tools/emulator/opengl/host/libs/Translator/EGL/EglWindowsApi.cpp +++ b/tools/emulator/opengl/host/libs/Translator/EGL/EglWindowsApi.cpp @@ -114,11 +114,11 @@ void queryConfigs(EGLNativeDisplayType dpy,ConfigList& listOut) { } -bool validNativeWin(EGLNativeWindowType win) { +bool validNativeWin(EGLNativeDisplayType dpy, EGLNativeWindowType win) { return IsWindow(win); } -bool validNativePixmap(EGLNativePixmapType pix) { +bool validNativePixmap(EGLNativeDisplayType dpy, EGLNativePixmapType pix) { BITMAP bm; return GetObject(pix, sizeof(BITMAP), (LPSTR)&bm); } diff --git a/tools/emulator/opengl/tests/gles_android_wrapper/CleanSpec.mk b/tools/emulator/opengl/tests/gles_android_wrapper/CleanSpec.mk index f7621a7dc..f56383a35 100644 --- a/tools/emulator/opengl/tests/gles_android_wrapper/CleanSpec.mk +++ b/tools/emulator/opengl/tests/gles_android_wrapper/CleanSpec.mk @@ -47,4 +47,4 @@ # ************************************************ # 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)