diff options
| author | Jesse Hall <jessehall@google.com> | 2012-03-27 16:07:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-27 16:07:20 -0700 |
| commit | cc4565ccc6f06f83734b4bf5740126ba5cd1ce4b (patch) | |
| tree | c56aceafa723066051e7b7d1d9f7596861425f39 | |
| parent | 9e14be6212cb902e839b28c42a904cf0e588510f (diff) | |
| parent | 4867dedb768370400f84f458507b59a4d3aef637 (diff) | |
| download | external_webkit-cc4565ccc6f06f83734b4bf5740126ba5cd1ce4b.zip external_webkit-cc4565ccc6f06f83734b4bf5740126ba5cd1ce4b.tar.gz external_webkit-cc4565ccc6f06f83734b4bf5740126ba5cd1ce4b.tar.bz2 | |
am 4867dedb: am 03eb739a: Prefer CpuUpload path on the emulator (DO NOT MERGE)
* commit '4867dedb768370400f84f458507b59a4d3aef637':
Prefer CpuUpload path on the emulator (DO NOT MERGE)
| -rw-r--r-- | Source/WebCore/platform/graphics/android/TransferQueue.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/TransferQueue.cpp b/Source/WebCore/platform/graphics/android/TransferQueue.cpp index b20ec7a..73cc570 100644 --- a/Source/WebCore/platform/graphics/android/TransferQueue.cpp +++ b/Source/WebCore/platform/graphics/android/TransferQueue.cpp @@ -35,6 +35,7 @@ #include <gui/SurfaceTextureClient.h> #include <cutils/log.h> +#include <cutils/properties.h> #include <wtf/text/CString.h> #define XLOGC(...) android_printLog(ANDROID_LOG_DEBUG, "TransferQueue", __VA_ARGS__) @@ -73,6 +74,14 @@ TransferQueue::TransferQueue() m_emptyItemCount = ST_BUFFER_NUMBER; m_transferQueue = new TileTransferData[ST_BUFFER_NUMBER]; + + // Two bugs made the GPU upload path unreliable on the GPU-accelerated + // emulator. The bugs are being fixed in later branches, but the fixes are + // too risky for this branch. Default to the CpuUpload path for now. + char qemuProp[PROPERTY_VALUE_MAX + 1]; + property_get("ro.kernel.qemu", qemuProp, "0"); + if (atoi(qemuProp) == 1) + m_currentUploadType = CpuUpload; } TransferQueue::~TransferQueue() |