aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/batches
diff options
context:
space:
mode:
authorGravatar bungeman <bungeman@google.com>2016-04-08 06:58:51 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-04-08 06:58:52 -0700
commit2c4bd0798e929acb9663668985eabe74d7378c46 (patch)
tree228e7970c5ab59b655726a28ffc9849a9b8746eb /src/gpu/batches
parent6a5d7139ff17a2dfdf136de35f7dd9c94c1f648b (diff)
Convert SkRefCnt to std::atomic.
This enables removing the more complicated atomic shims from SkAtomics.h. TBR=reed This doesn't actually change any API. CQ_EXTRA_TRYBOTS=client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN-Trybot,Test-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-TSAN-Trybot Review URL: https://codereview.chromium.org/1867863002
Diffstat (limited to 'src/gpu/batches')
-rw-r--r--src/gpu/batches/GrBatch.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gpu/batches/GrBatch.h b/src/gpu/batches/GrBatch.h
index 278c826a73..f0559330fe 100644
--- a/src/gpu/batches/GrBatch.h
+++ b/src/gpu/batches/GrBatch.h
@@ -8,12 +8,13 @@
#ifndef GrBatch_DEFINED
#define GrBatch_DEFINED
-#include <new>
+#include "../private/SkAtomics.h"
#include "GrNonAtomicRef.h"
-
#include "SkRect.h"
#include "SkString.h"
+#include <new>
+
class GrCaps;
class GrBatchFlushState;
class GrRenderTarget;