aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-11-21 15:57:40 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-11-21 15:57:40 +0000
commit8660783e196dc3cb4ead492253a493844fa43f7a (patch)
treef8b108a28254e3d13c44f5068d9afde50b579ac1 /src/gpu
parent22d39332bdba4e2e36aa050220392dcd33d81c19 (diff)
Minor fix in Ganesh shader generation.
R=bsalomon@google.com Author: skaslev@chromium.org Review URL: https://codereview.chromium.org/78843006 git-svn-id: http://skia.googlecode.com/svn/trunk@12343 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu')
-rw-r--r--src/gpu/gl/GrGLSL.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gpu/gl/GrGLSL.cpp b/src/gpu/gl/GrGLSL.cpp
index 0f740d9290..dce44f3aff 100644
--- a/src/gpu/gl/GrGLSL.cpp
+++ b/src/gpu/gl/GrGLSL.cpp
@@ -86,6 +86,7 @@ void GrGLSLMulVarBy4f(SkString* outAppend,
if (mulFactor.isZeros()) {
outAppend->appendf("%s = vec4(0);\n", vec4VarName);
+ } else {
+ outAppend->appendf("%s *= %s;\n", vec4VarName, mulFactor.c_str());
}
- outAppend->appendf("%s *= %s;\n", vec4VarName, mulFactor.c_str());
}