diff options
| author |  bsalomon <bsalomon@google.com> | 2015-09-09 18:57:49 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-09 18:57:49 -0700 |
| commit | 32ab260ee18ab53611bcd2eefde535b6e31f9d8d (patch) | |
| tree | b3f8b5c0e45d46113e4950bd1a4af8b129b25b7c /include | |
| parent | eb662bc407cec0585a821946fef123102cae64db (diff) | |
Revert of Add a mutex to GrContext::readSurfacePixels to protect against multiple CPU raster threads accessin… (patchset #1 id:1 of https://codereview.chromium.org/1329313002/ )
Reason for revert:
breaking the bots
Original issue's description:
> Add a mutex to GrContext::readSurfacePixels to protect against multiple CPU raster threads accessing the same GrContext to read back GPU input data
>
> BUG=chromium:524717
>
> TBR=reed@google.com
>
> Committed: https://skia.googlesource.com/skia/+/eb662bc407cec0585a821946fef123102cae64db
TBR=reed@google.com,reed@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:524717
Review URL: https://codereview.chromium.org/1334603002
Diffstat (limited to 'include')
| -rw-r--r-- | include/gpu/GrContext.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index dcff3063b2..7f1e4109fa 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -15,7 +15,6 @@ #include "GrRenderTarget.h" #include "GrTextureProvider.h" #include "SkMatrix.h" -#include "SkMutex.h" #include "SkPathEffect.h" #include "SkTypes.h" @@ -381,11 +380,6 @@ private: bool fDidTestPMConversions; int fPMToUPMConversion; int fUPMToPMConversion; - // The sw backend may call GrContext::readSurfacePixels on multiple threads - // We may transfer the responsibilty for using a mutex to the sw backend - // when there are fewer code paths that lead to a readSurfacePixels call - // from the sw backend. - SkMutex fReadPixelsMutex; struct CleanUpData { PFCleanUpFunc fFunc; |