diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-07 17:12:55 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-07 17:12:55 +0000 |
| commit | 44e3f715e694e2a97ab283a10dcbc26556d92018 (patch) | |
| tree | 29664cf04bb2932f4c5c51345c9906eac035d9e5 | |
| parent | 30602abc33c4d89aad5b72c1d5ef456d5d46b0ce (diff) | |
GameBench: curCell doesn't need to be extra state.
We're using a static curCell to loop around the atlas. We can just use i.
Noticed this when TSAN complained about it. Parallel invocations of the
game bench were stomping on each other's curCell.
BUG=skia:1792
R=robertphillips@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/270273006
git-svn-id: http://skia.googlecode.com/svn/trunk@14617 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | bench/GameBench.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bench/GameBench.cpp b/bench/GameBench.cpp index 839440b612..c0a0e1b1b3 100644 --- a/bench/GameBench.cpp +++ b/bench/GameBench.cpp @@ -190,9 +190,8 @@ protected: canvas->concat(mat); if (fUseAtlas) { - static int curCell = 0; + const int curCell = i % (kNumAtlasedX * kNumAtlasedY); SkIRect src = fAtlasRects[curCell % (kNumAtlasedX)][curCell / (kNumAtlasedX)]; - curCell = (curCell + 1) % (kNumAtlasedX*kNumAtlasedY); if (fUseDrawVertices) { SkPoint uvs[4] = { |