diff options
author | dhewg | 2011-02-19 17:30:30 +0100 |
---|---|---|
committer | dhewg | 2011-02-19 20:15:51 +0100 |
commit | adf2225eb414b04a0e58f1fad221cdef27017391 (patch) | |
tree | 57b56e98bf8391d95ed898c73942ecf0b8c85e43 /backends/platform/android/android.h | |
parent | 229e3ca5bf4bbc91b6bf85a5fe6dd9356a97a5ef (diff) | |
download | scummvm-rg350-adf2225eb414b04a0e58f1fad221cdef27017391.tar.gz scummvm-rg350-adf2225eb414b04a0e58f1fad221cdef27017391.tar.bz2 scummvm-rg350-adf2225eb414b04a0e58f1fad221cdef27017391.zip |
ANDROID: Move helper defines in a new header file
- added a few macros for convinience
- use them
- replaced CHECK_GL_ERROR with GLCALL
- spam GLCALL
Diffstat (limited to 'backends/platform/android/android.h')
-rw-r--r-- | backends/platform/android/android.h | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h new file mode 100644 index 0000000000..855fb04b5d --- /dev/null +++ b/backends/platform/android/android.h @@ -0,0 +1,70 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + * + */ + +#if defined(__ANDROID__) + +#include <android/log.h> + +#include <GLES/gl.h> +#include <GLES/glext.h> + +// toggles start +//#define ANDROID_DEBUG_ENTER +//#define ANDROID_DEBUG_GL +// toggles end + +extern const char *android_log_tag; + +#define _ANDROID_LOG(prio, fmt, args...) __android_log_print(prio, android_log_tag, fmt, ## args) +#define LOGD(fmt, args...) _ANDROID_LOG(ANDROID_LOG_DEBUG, fmt, ##args) +#define LOGI(fmt, args...) _ANDROID_LOG(ANDROID_LOG_INFO, fmt, ##args) +#define LOGW(fmt, args...) _ANDROID_LOG(ANDROID_LOG_WARN, fmt, ##args) +#define LOGE(fmt, args...) _ANDROID_LOG(ANDROID_LOG_ERROR, fmt, ##args) + +#ifdef ANDROID_DEBUG_ENTER +#define ENTER(fmt, args...) LOGD("%s(" fmt ")", __FUNCTION__, ##args) +#else +#define ENTER(fmt, args...) /**/ +#endif + +#ifdef ANDROID_DEBUG_GL +extern void checkGlError(const char *expr, const char *file, int line); + +#define GLCALL(x) \ + do { \ + (x); \ + checkGlError(#x, __FILE__, __LINE__); \ + } while (false) + +#else +#define GLCALL(x) do { (x); } while (false) +#endif + +// Fix JNIEXPORT declaration to actually do something useful +#undef JNIEXPORT +#define JNIEXPORT __attribute__ ((visibility("default"))) + +#endif + |