diff options
| author | Jesse Hall <jessehall@google.com> | 2012-03-27 16:05:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-03-27 16:05:38 -0700 |
| commit | 83e18a777dd69e2b64e2573642ce6c27a2198de5 (patch) | |
| tree | 5874c7c8cea5a6a59473c55cd0378d9bf66b00e6 | |
| parent | 282bc0d6457484502961a2dcbfa3b72b3495ba2e (diff) | |
| parent | 03eb739a2acccb243076c064d6a0ce5e196a11f6 (diff) | |
| download | external_webkit-83e18a777dd69e2b64e2573642ce6c27a2198de5.zip external_webkit-83e18a777dd69e2b64e2573642ce6c27a2198de5.tar.gz external_webkit-83e18a777dd69e2b64e2573642ce6c27a2198de5.tar.bz2 | |
am 03eb739a: Prefer CpuUpload path on the emulator (DO NOT MERGE)
* commit '03eb739a2acccb243076c064d6a0ce5e196a11f6':
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() |