diff options
| author | dhewg | 2011-02-24 18:24:27 +0100 |
|---|---|---|
| committer | dhewg | 2011-02-24 23:18:34 +0100 |
| commit | a636d41ca8c066adfed4fd16d9a2e46de5fab871 (patch) | |
| tree | 16bb432b3963c787f11769a798d75c8d400ccc00 /backends/platform/android/android.h | |
| parent | 36135443b9263e0125c8f9f2834818c2f9465983 (diff) | |
| download | scummvm-rg350-a636d41ca8c066adfed4fd16d9a2e46de5fab871.tar.gz scummvm-rg350-a636d41ca8c066adfed4fd16d9a2e46de5fab871.tar.bz2 scummvm-rg350-a636d41ca8c066adfed4fd16d9a2e46de5fab871.zip | |
ANDROID: Check thread origin when debugging GL
Diffstat (limited to 'backends/platform/android/android.h')
| -rw-r--r-- | backends/platform/android/android.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/backends/platform/android/android.h b/backends/platform/android/android.h index 8fc138d42b..23c1e85a43 100644 --- a/backends/platform/android/android.h +++ b/backends/platform/android/android.h @@ -61,7 +61,7 @@ extern const char *android_log_tag; #ifdef ANDROID_DEBUG_ENTER #define ENTER(fmt, args...) LOGD("%s(" fmt ")", __FUNCTION__, ##args) #else -#define ENTER(fmt, args...) /**/ +#define ENTER(fmt, args...) do { } while (false) #endif #ifdef ANDROID_DEBUG_GL @@ -73,8 +73,14 @@ extern void checkGlError(const char *expr, const char *file, int line); checkGlError(#x, __FILE__, __LINE__); \ } while (false) +#define GLTHREADCHECK \ + do { \ + assert(pthread_self() == _main_thread); \ + } while (false) + #else #define GLCALL(x) do { (x); } while (false) +#define GLTHREADCHECK do { } while (false) #endif #ifdef DYNAMIC_MODULES @@ -111,6 +117,8 @@ private: Common::Queue<Common::Event> _event_queue; MutexRef _event_queue_lock; + pthread_t _main_thread; + bool _timer_thread_exit; pthread_t _timer_thread; static void *timerThreadFunc(void *arg); |