| OLD | NEW | 
|    1  |    1  | 
|    2 /* |    2 /* | 
|    3  * Copyright 2011 Google Inc. |    3  * Copyright 2011 Google Inc. | 
|    4  * |    4  * | 
|    5  * Use of this source code is governed by a BSD-style license that can be |    5  * Use of this source code is governed by a BSD-style license that can be | 
|    6  * found in the LICENSE file. |    6  * found in the LICENSE file. | 
|    7  */ |    7  */ | 
|    8  |    8  | 
|    9 #include "GrContext.h" |    9 #include "GrContext.h" | 
|   10  |   10  | 
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  317 } |  317 } | 
|  318  |  318  | 
|  319 bool GrContext::writeSurfacePixels(GrSurface* surface, |  319 bool GrContext::writeSurfacePixels(GrSurface* surface, | 
|  320                                    int left, int top, int width, int height, |  320                                    int left, int top, int width, int height, | 
|  321                                    GrPixelConfig srcConfig, const void* buffer, 
     size_t rowBytes, |  321                                    GrPixelConfig srcConfig, const void* buffer, 
     size_t rowBytes, | 
|  322                                    uint32_t pixelOpsFlags) { |  322                                    uint32_t pixelOpsFlags) { | 
|  323     RETURN_FALSE_IF_ABANDONED |  323     RETURN_FALSE_IF_ABANDONED | 
|  324     { |  324     { | 
|  325         GrTexture* texture = NULL; |  325         GrTexture* texture = NULL; | 
|  326         if (!(kUnpremul_PixelOpsFlag & pixelOpsFlags) && (texture = surface->asT
     exture()) && |  326         if (!(kUnpremul_PixelOpsFlag & pixelOpsFlags) && (texture = surface->asT
     exture()) && | 
|  327             fGpu->canWriteTexturePixels(texture, srcConfig)) { |  327             fGpu->canWriteTexturePixels(texture, srcConfig) && | 
 |  328             (!fCaps->useDrawInsteadOfPartialRenderTargetWrite() || !surface->asR
     enderTarget() || | 
 |  329               (width == texture->width() && height == texture->height()))) { | 
|  328  |  330  | 
|  329             if (!(kDontFlush_PixelOpsFlag & pixelOpsFlags) && |  331             if (!(kDontFlush_PixelOpsFlag & pixelOpsFlags) && | 
|  330                 surface->surfacePriv().hasPendingIO()) { |  332                 surface->surfacePriv().hasPendingIO()) { | 
|  331                 this->flush(); |  333                 this->flush(); | 
|  332             } |  334             } | 
|  333             return fGpu->writeTexturePixels(texture, left, top, width, height, |  335             return fGpu->writeTexturePixels(texture, left, top, width, height, | 
|  334                                             srcConfig, buffer, rowBytes); |  336                                             srcConfig, buffer, rowBytes); | 
|  335             // Don't need to check kFlushWrites_PixelOp here, we just did a dire
     ct write so the |  337             // Don't need to check kFlushWrites_PixelOp here, we just did a dire
     ct write so the | 
|  336             // upload is already flushed. |  338             // upload is already flushed. | 
|  337         } |  339         } | 
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  745 ////////////////////////////////////////////////////////////////////////////// |  747 ////////////////////////////////////////////////////////////////////////////// | 
|  746  |  748  | 
|  747 void GrContext::addGpuTraceMarker(const GrGpuTraceMarker* marker) { |  749 void GrContext::addGpuTraceMarker(const GrGpuTraceMarker* marker) { | 
|  748     fGpu->addGpuTraceMarker(marker); |  750     fGpu->addGpuTraceMarker(marker); | 
|  749 } |  751 } | 
|  750  |  752  | 
|  751 void GrContext::removeGpuTraceMarker(const GrGpuTraceMarker* marker) { |  753 void GrContext::removeGpuTraceMarker(const GrGpuTraceMarker* marker) { | 
|  752     fGpu->removeGpuTraceMarker(marker); |  754     fGpu->removeGpuTraceMarker(marker); | 
|  753 } |  755 } | 
|  754  |  756  | 
| OLD | NEW |