commit 2dc29940c54b5d21c81dade8a7755dd08316b6b3
author jvanverth <jvanverth@google.com> Tue Sep 01 07:16:46 2015 -0700
committer Commit bot <commit-bot@chromium.org> Tue Sep 01 07:16:46 2015 -0700
tree 91f2822e5bfe77b291df0df6707b7a5ba92840c6
parent c5281e5b103247a7d5cd8c266a2269d114081a47

Various minor cross-platform changes

Review URL: https://codereview.chromium.org/1310843007

src/gpu/GrGpu.cpp

diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
index 2fdfbc4..9f8e5e6 100644
--- a/src/gpu/GrGpu.cpp
+++ b/src/gpu/GrGpu.cpp
@@ -279,6 +279,11 @@
     SkASSERT(tempDrawInfo);
     SkASSERT(kGpuPrefersDraw_DrawPreference != *drawPreference);
 
+    if (GrPixelConfigIsCompressed(dstSurface->desc().fConfig) &&
+        dstSurface->desc().fConfig != srcConfig) {
+        return false;
+    }
+
     if (this->caps()->useDrawInsteadOfPartialRenderTargetWrite() &&
         SkToBool(dstSurface->asRenderTarget()) &&
         (width < dstSurface->width() || height < dstSurface->height())) {
@@ -332,6 +337,10 @@
                         int left, int top, int width, int height,
                         GrPixelConfig config, const void* buffer,
                         size_t rowBytes) {
+    if (!buffer) {
+        return false;
+    }
+
     this->handleDirtyContext();
     if (this->onWritePixels(surface, left, top, width, height, config, buffer, rowBytes)) {
         fStats.incTextureUploads();