diff options
| author |  mtklein <mtklein@chromium.org> | 2016-09-26 08:39:43 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-26 08:39:43 -0700 |
| commit | 85552e4f9d65c8e751d106fae173374346863cdf (patch) | |
| tree | 7fcf8f54ec043e0c02a5433b8d3cd9db743718fa /src | |
| parent | 477ba0c18a21e24646702c5eda6d966c75969183 (diff) | |
Quiet a -Wcomma warning.
Clang's got a warning -Wcomma that warns about possible unintentional uses of
the comma operator, usually where a semicolon looks itended.
I don't think there's a bug here, but a semicolon does work just as well
and reads a bit more conventionally. Though, I'm not actually sure how this
parses, as fp = ...; glslFP = ...; or fp = (..., glsl = ...). The second
would most definitely be a bug.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2365403002
NOTREECHECKS=true
Review-Url: https://codereview.chromium.org/2365403002
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/gl/GrGLProgram.cpp | 3 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkPipelineState.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp index dd73d01dc1..86b237266b 100644 --- a/src/gpu/gl/GrGLProgram.cpp +++ b/src/gpu/gl/GrGLProgram.cpp @@ -111,7 +111,8 @@ void GrGLProgram::setFragmentData(const GrPrimitiveProcessor& primProc, while (fp && glslFP) { glslFP->setData(fProgramDataManager, *fp); this->bindTextures(*fp, pipeline.getAllowSRGBInputs(), nextSamplerIdx); - fp = iter.next(), glslFP = glslIter.next(); + fp = iter.next(); + glslFP = glslIter.next(); } SkASSERT(!fp && !glslFP); } diff --git a/src/gpu/vk/GrVkPipelineState.cpp b/src/gpu/vk/GrVkPipelineState.cpp index 48724c07ba..71ce831d65 100644 --- a/src/gpu/vk/GrVkPipelineState.cpp +++ b/src/gpu/vk/GrVkPipelineState.cpp @@ -206,7 +206,8 @@ void GrVkPipelineState::setData(GrVkGpu* gpu, while (fp && glslFP) { glslFP->setData(fDataManager, *fp); append_texture_bindings(*fp, &textureBindings); - fp = iter.next(), glslFP = glslIter.next(); + fp = iter.next(); + glslFP = glslIter.next(); } SkASSERT(!fp && !glslFP); |