diff options
| author | Chris Craik <ccraik@google.com> | 2015-08-20 15:14:06 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2015-08-21 23:05:44 +0000 |
| commit | b9ce116dac378b4cf4490f265dcbd5704a1dd43c (patch) | |
| tree | 359fda22ac4f3c659c1afe2542a8266b9278318b /libs/hwui/renderstate/RenderState.cpp | |
| parent | e4a6f925621e9360238869ae28f7df1b4c2d97de (diff) | |
Switch several enums to enum classes
Change-Id: I00ecd0b61657196b51704f70ca31a9d1c1ac254e
Diffstat (limited to 'libs/hwui/renderstate/RenderState.cpp')
| -rw-r--r-- | libs/hwui/renderstate/RenderState.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/renderstate/RenderState.cpp b/libs/hwui/renderstate/RenderState.cpp index b5ed9e6558a7..c5126def683c 100644 --- a/libs/hwui/renderstate/RenderState.cpp +++ b/libs/hwui/renderstate/RenderState.cpp @@ -229,11 +229,11 @@ void RenderState::render(const Glop& glop) { glop.transform.transformFlags & TransformFlags::OffsetByFudgeFactor); // Color filter uniforms - if (fill.filterMode == ProgramDescription::kColorBlend) { + if (fill.filterMode == ProgramDescription::ColorFilterMode::Blend) { const FloatColor& color = fill.filter.color; glUniform4f(mCaches->program().getUniform("colorBlend"), color.r, color.g, color.b, color.a); - } else if (fill.filterMode == ProgramDescription::kColorMatrix) { + } else if (fill.filterMode == ProgramDescription::ColorFilterMode::Matrix) { glUniformMatrix4fv(mCaches->program().getUniform("colorMatrix"), 1, GL_FALSE, fill.filter.matrix.matrix); glUniform4fv(mCaches->program().getUniform("colorMatrixVector"), 1, |