AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Quiet a -Wcomma warning.

Browse Source 
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
This commit is contained in:
mtklein 2016-09-26 08:39:43 -07:00 committed by Commit bot
parent 477ba0c18a
commit 85552e4f9d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gpu/gl/GrGLProgram.cpp
View File

@ -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);
}

3
src/gpu/vk/GrVkPipelineState.cpp
View File

@ -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);