| Index: cc/UnthrottledTextureUploader.cpp
|
| diff --git a/cc/UnthrottledTextureUploader.cpp b/cc/UnthrottledTextureUploader.cpp
|
| index 82b43373cd7a9528688c73ba500a5d275765538a..777f81209d1ed5ce3df852a72415121e325b06d2 100644
|
| --- a/cc/UnthrottledTextureUploader.cpp
|
| +++ b/cc/UnthrottledTextureUploader.cpp
|
| @@ -6,6 +6,8 @@
|
|
|
| #include "UnthrottledTextureUploader.h"
|
|
|
| +#include "CCPrioritizedTexture.h"
|
| +
|
| namespace cc {
|
|
|
| size_t UnthrottledTextureUploader::numBlockingUploads()
|
| @@ -24,7 +26,26 @@ double UnthrottledTextureUploader::estimatedTexturesPerSecond()
|
|
|
| void UnthrottledTextureUploader::uploadTexture(CCResourceProvider* resourceProvider, Parameters upload)
|
| {
|
| - upload.texture->updateRect(resourceProvider, upload.sourceRect, upload.destOffset);
|
| + if (upload.bitmap) {
|
| + upload.bitmap->lockPixels();
|
| + upload.texture->upload(
|
| + resourceProvider,
|
| + static_cast<const uint8_t*>(upload.bitmap->getPixels()),
|
| + upload.geometry.contentRect,
|
| + upload.geometry.sourceRect,
|
| + upload.geometry.destOffset);
|
| + upload.bitmap->unlockPixels();
|
| + }
|
| +
|
| + // TODO(reveman): Move this logic to CCTextureUpdateController.
|
| + if (upload.picture) {
|
| + upload.texture->acceleratedUpdate(
|
| + resourceProvider,
|
| + upload.picture,
|
| + upload.geometry.contentRect,
|
| + upload.geometry.sourceRect,
|
| + upload.geometry.destOffset);
|
| + }
|
| }
|
|
|
| }
|
|
|