diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-07 19:53:49 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-02-07 19:53:49 +0000 |
| commit | 51ac7e6d97d7f92ffb4b29b867dba1089836e0cb (patch) | |
| tree | c4f89dde6a1338b6176528d7a92cd6a9e3858d68 /src/gpu | |
| parent | 753a362cfc336062cae7b55c285332a0d1c8ae72 (diff) | |
Remove GR_AGGRESSIVE_SHADER_OPTS build option.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/7312058
git-svn-id: http://skia.googlecode.com/svn/trunk@7650 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/gl/GrGpuGL_program.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGpuGL_program.cpp b/src/gpu/gl/GrGpuGL_program.cpp index 873317a58d..7a3ae4cd6c 100644 --- a/src/gpu/gl/GrGpuGL_program.cpp +++ b/src/gpu/gl/GrGpuGL_program.cpp @@ -529,9 +529,9 @@ void GrGpuGL::buildProgram(bool isPoints, bool colorIsTransBlack = SkToBool(blendOpts & kEmitTransBlack_BlendOptFlag); bool colorIsSolidWhite = (blendOpts & kEmitCoverage_BlendOptFlag) || (!requiresAttributeColors && 0xffffffff == drawState.getColor()); - if (GR_AGGRESSIVE_SHADER_OPTS && colorIsTransBlack) { + if (colorIsTransBlack) { desc->fColorInput = ProgramDesc::kTransBlack_ColorInput; - } else if (GR_AGGRESSIVE_SHADER_OPTS && colorIsSolidWhite) { + } else if (colorIsSolidWhite) { desc->fColorInput = ProgramDesc::kSolidWhite_ColorInput; } else if (GR_GL_NO_CONSTANT_ATTRIBUTES && !requiresAttributeColors) { desc->fColorInput = ProgramDesc::kUniform_ColorInput; |