diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-28 14:29:23 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-28 14:29:23 +0000 |
| commit | b930cc3dcb0645a8ce0689c5feb9c0defda57f28 (patch) | |
| tree | cf5029649994cf33b4785953e96e89ae34008885 /src/gpu | |
| parent | c0df2fb5d0421a649d1dff9133874e440300fa7c (diff) | |
Please Valgrind by calling preConcat.
Valgrind's whining about m.setConcat(m, I). That special cases into m =
m, which compiles into memcpy(&m, &m, sizeof(m)), and then Valgrind
decides that's not kosher because &m and &m overlap. (memmove would
have been fine, but this is compiler generated code; not much we can do.)
preConcat gets us the same thing with an early can-we-noop check for I,
sidestepping the whole problem.
BUG=skia:
R=bsalomon@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/214823003
git-svn-id: http://skia.googlecode.com/svn/trunk@13972 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/gl/GrGLProgram.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h index 8e2ae74aab..0a2a242fca 100644 --- a/src/gpu/gl/GrGLProgram.h +++ b/src/gpu/gl/GrGLProgram.h @@ -114,7 +114,7 @@ public: 0, SkIntToScalar(2) / fRenderTargetSize.fHeight, -SK_Scalar1, 0, 0, SkMatrix::I()[8]); } - combined.setConcat(combined, fViewMatrix); + combined.preConcat(fViewMatrix); GrGLGetMatrix<Size>(destMatrix, combined); } }; |