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

Remove tab parameter from GrGLSLMulVarBy4f function

Browse Source 
With pretty printing of shader code, there is no longer a need to explictily
have tabs in our code.

BUG=skia:

Review URL: https://codereview.chromium.org/648463002
This commit is contained in:
egdaniel 2014-10-09 10:34:58 -07:00 committed by Commit bot
parent 1e2530babb
commit 089f8de82d
8 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/effects/SkLightingImageFilter.cpp
View File

@ -1454,7 +1454,7 @@ void GrGLLightingEffect::emitCode(GrGLProgramBuilder* builder,
fLight->emitLightColor(builder, "surfaceToLight"); fLight->emitLightColor(builder, "surfaceToLight");
fsBuilder->codeAppend(");\n"); fsBuilder->codeAppend(");\n");
SkString modulate; SkString modulate;
GrGLSLMulVarBy4f(&modulate, 2, outputColor, inputColor); GrGLSLMulVarBy4f(&modulate, outputColor, inputColor);
fsBuilder->codeAppend(modulate.c_str()); fsBuilder->codeAppend(modulate.c_str());
} }

2
src/effects/SkMagnifierImageFilter.cpp
View File

@ -168,7 +168,7 @@ void GrGLMagnifierEffect::emitCode(GrGLProgramBuilder* builder,
fsBuilder->codeAppendf("\t\t%s = output_color;", outputColor); fsBuilder->codeAppendf("\t\t%s = output_color;", outputColor);
SkString modulate; SkString modulate;
GrGLSLMulVarBy4f(&modulate, 2, outputColor, inputColor); GrGLSLMulVarBy4f(&modulate, outputColor, inputColor);
fsBuilder->codeAppend(modulate.c_str()); fsBuilder->codeAppend(modulate.c_str());
} }

2
src/effects/SkMorphologyImageFilter.cpp
View File

@ -399,7 +399,7 @@ void GrGLMorphologyEffect::emitCode(GrGLProgramBuilder* builder,
fsBuilder->codeAppendf("\t\t\tcoord += %s;\n", imgInc); fsBuilder->codeAppendf("\t\t\tcoord += %s;\n", imgInc);
fsBuilder->codeAppend("\t\t}\n"); fsBuilder->codeAppend("\t\t}\n");
SkString modulate; SkString modulate;
GrGLSLMulVarBy4f(&modulate, 2, outputColor, inputColor); GrGLSLMulVarBy4f(&modulate, outputColor, inputColor);
fsBuilder->codeAppend(modulate.c_str()); fsBuilder->codeAppend(modulate.c_str());
} }

2
src/gpu/effects/GrConfigConversionEffect.cpp
View File

@ -81,7 +81,7 @@ public:
fsBuilder->codeAppendf("%s = %s;", outputColor, tmpVar.c_str()); fsBuilder->codeAppendf("%s = %s;", outputColor, tmpVar.c_str());
} }
SkString modulate; SkString modulate;
GrGLSLMulVarBy4f(&modulate, 2, outputColor, inputColor); GrGLSLMulVarBy4f(&modulate, outputColor, inputColor);
fsBuilder->codeAppend(modulate.c_str()); fsBuilder->codeAppend(modulate.c_str());
} }

2
src/gpu/effects/GrConvolutionEffect.cpp
View File

@ -101,7 +101,7 @@ void GrGLConvolutionEffect::emitCode(GrGLProgramBuilder* builder,
} }
SkString modulate; SkString modulate;
GrGLSLMulVarBy4f(&modulate, 2, outputColor, inputColor); GrGLSLMulVarBy4f(&modulate, outputColor, inputColor);
fsBuilder->codeAppend(modulate.c_str()); fsBuilder->codeAppend(modulate.c_str());
} }

2
src/gpu/effects/GrMatrixConvolutionEffect.cpp
View File

@ -116,7 +116,7 @@ void GrGLMatrixConvolutionEffect::emitCode(GrGLProgramBuilder* builder,
} }
SkString modulate; SkString modulate;
GrGLSLMulVarBy4f(&modulate, 2, outputColor, inputColor); GrGLSLMulVarBy4f(&modulate, outputColor, inputColor);
fsBuilder->codeAppend(modulate.c_str()); fsBuilder->codeAppend(modulate.c_str());
} }

22
src/gpu/gl/GrGLSL.cpp
View File

@ -69,30 +69,14 @@ const char* GrGetGLSLVersionDecl(const GrGLContextInfo& info) {
} }
} }
namespace { void GrGLSLMulVarBy4f(SkString* outAppend, const char* vec4VarName, const GrGLSLExpr4& mulFactor) {
void append_tabs(SkString* outAppend, int tabCnt) {
static const char kTabs[] = "\t\t\t\t\t\t\t\t";
while (tabCnt) {
int cnt = SkTMin((int)SK_ARRAY_COUNT(kTabs), tabCnt);
outAppend->append(kTabs, cnt);
tabCnt -= cnt;
}
}
}
void GrGLSLMulVarBy4f(SkString* outAppend,
unsigned tabCnt,
const char* vec4VarName,
const GrGLSLExpr4& mulFactor) {
if (mulFactor.isOnes()) { if (mulFactor.isOnes()) {
*outAppend = SkString(); *outAppend = SkString();
} }
append_tabs(outAppend, tabCnt);
if (mulFactor.isZeros()) { if (mulFactor.isZeros()) {
outAppend->appendf("%s = vec4(0);\n", vec4VarName); outAppend->appendf("%s = vec4(0);", vec4VarName);
} else { } else {
outAppend->appendf("%s *= %s;\n", vec4VarName, mulFactor.c_str()); outAppend->appendf("%s *= %s;", vec4VarName, mulFactor.c_str());
} }
} }

5
src/gpu/gl/GrGLSL.h
View File

@ -310,10 +310,9 @@ private:
/** /**
* Does an inplace mul, *=, of vec4VarName by mulFactor. * Does an inplace mul, *=, of vec4VarName by mulFactor.
* A semicolon and newline are added after the assignment. * A semicolon is added after the assignment.
*/ */
void GrGLSLMulVarBy4f(SkString* outAppend, unsigned tabCnt, void GrGLSLMulVarBy4f(SkString* outAppend, const char* vec4VarName, const GrGLSLExpr4& mulFactor);
const char* vec4VarName, const GrGLSLExpr4& mulFactor);
#include "GrGLSL_impl.h" #include "GrGLSL_impl.h"