Skip to content
Browse files

am 03eb739: Prefer CpuUpload path on the emulator (DO NOT MERGE)

* commit '03eb739a2acccb243076c064d6a0ce5e196a11f6':
  Prefer CpuUpload path on the emulator (DO NOT MERGE)
  • Loading branch information...
2 parents 855681a + 03eb739 commit 6c77872612057962cfb09850a0d4f20436172ef7 @critsec critsec committed with Android Git Automerger Mar 29, 2012
Showing with 9 additions and 0 deletions.
  1. +9 −0 Source/WebCore/platform/graphics/android/TransferQueue.cpp
View
9 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()

0 comments on commit 6c77872

Please sign in to comment.
Something went wrong with that request. Please try again.