diff options
| author |  mtklein <mtklein@chromium.org> | 2015-01-21 19:51:27 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-21 19:51:27 -0800 |
| commit | 4daa6f613cb7d8a3c07369af3e919ea65405ec55 (patch) | |
| tree | c46b7e2e4ef4875532a0f1a37b3e95adfdfb3c53 /src/core | |
| parent | 55e88b226ccb85d2c712a9e3e9e1f5bdcaac05ac (diff) | |
Don't require -DSK_USE_POSIX_THREADS.
To compile SkCondVar, we already require either pthreads or Windows. This
simplifies that code to not need SK_USE_POSIX_THREADS to be explicitly defined.
We'll just look to see if we're targeting Windows, and if not, assume pthreads.
Both before and after this CL, that code will fail to compile if we're not on
Windows and don't have pthreads.
BUG=skia:
Review URL: https://codereview.chromium.org/869443003
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkPixelRef.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/core/SkPixelRef.cpp b/src/core/SkPixelRef.cpp index a2c37c6e72..bb4a5eff88 100644 --- a/src/core/SkPixelRef.cpp +++ b/src/core/SkPixelRef.cpp @@ -8,8 +8,14 @@ #include "SkPixelRef.h" #include "SkThread.h" -#ifdef SK_USE_POSIX_THREADS +#ifdef SK_BUILD_FOR_WIN32 + // We don't have SK_BASE_MUTEX_INIT on Windows. + // must be a power-of-2. undef to just use 1 mutex + #define PIXELREF_MUTEX_RING_COUNT 32 + static SkBaseMutex gPixelRefMutexRing[PIXELREF_MUTEX_RING_COUNT]; + +#else static SkBaseMutex gPixelRefMutexRing[] = { SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT, @@ -31,16 +37,9 @@ SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT, SK_BASE_MUTEX_INIT, }; - // must be a power-of-2. undef to just use 1 mutex #define PIXELREF_MUTEX_RING_COUNT SK_ARRAY_COUNT(gPixelRefMutexRing) -#else // not pthreads - - // must be a power-of-2. undef to just use 1 mutex - #define PIXELREF_MUTEX_RING_COUNT 32 - static SkBaseMutex gPixelRefMutexRing[PIXELREF_MUTEX_RING_COUNT]; - #endif static SkBaseMutex* get_default_mutex() { |