diff options
| author | 2015-02-03 00:00:57 +0000 | |
|---|---|---|
| committer | 2015-02-03 00:00:58 +0000 | |
| commit | 9dfd7bd520ee598b3033a0c47b8b649bd3988c7c (patch) | |
| tree | 73de6cf28c9296701cb202addfbf51cea6833d62 /libs/hwui/GammaFontRenderer.cpp | |
| parent | d8f32ea2dffd3f6a080b4eb55a11c0f1c6d7a3a6 (diff) | |
| parent | 6c15ffa196fc9b7724c189d833c3435d8db12266 (diff) | |
Merge "Refactoring of Program ownership/lifecycle, and WIP Glop rendering path"
Diffstat (limited to 'libs/hwui/GammaFontRenderer.cpp')
| -rw-r--r-- | libs/hwui/GammaFontRenderer.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libs/hwui/GammaFontRenderer.cpp b/libs/hwui/GammaFontRenderer.cpp index e97a4771ae3f..0bcd83a1a050 100644 --- a/libs/hwui/GammaFontRenderer.cpp +++ b/libs/hwui/GammaFontRenderer.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#define LOG_TAG "OpenGLRenderer" - #include "Debug.h" #include "GammaFontRenderer.h" #include "Properties.h" @@ -96,7 +94,8 @@ GammaFontRenderer::~GammaFontRenderer() { // Shader-based renderer /////////////////////////////////////////////////////////////////////////////// -ShaderGammaFontRenderer::ShaderGammaFontRenderer(bool multiGamma): GammaFontRenderer() { +ShaderGammaFontRenderer::ShaderGammaFontRenderer(bool multiGamma) + : GammaFontRenderer() { INIT_LOGD("Creating shader gamma font renderer"); mRenderer = nullptr; mMultiGamma = multiGamma; @@ -123,9 +122,9 @@ void ShaderGammaFontRenderer::describe(ProgramDescription& description, } void ShaderGammaFontRenderer::setupProgram(ProgramDescription& description, - Program* program) const { + Program& program) const { if (description.hasGammaCorrection) { - glUniform1f(program->getUniform("gamma"), description.gamma); + glUniform1f(program.getUniform("gamma"), description.gamma); } } @@ -139,7 +138,8 @@ void ShaderGammaFontRenderer::endPrecaching() { // Lookup-based renderer /////////////////////////////////////////////////////////////////////////////// -LookupGammaFontRenderer::LookupGammaFontRenderer(): GammaFontRenderer() { +LookupGammaFontRenderer::LookupGammaFontRenderer() + : GammaFontRenderer() { INIT_LOGD("Creating lookup gamma font renderer"); // Compute the gamma tables @@ -162,7 +162,8 @@ void LookupGammaFontRenderer::endPrecaching() { // Lookup-based renderer, using 3 different correction tables /////////////////////////////////////////////////////////////////////////////// -Lookup3GammaFontRenderer::Lookup3GammaFontRenderer(): GammaFontRenderer() { +Lookup3GammaFontRenderer::Lookup3GammaFontRenderer() + : GammaFontRenderer() { INIT_LOGD("Creating lookup3 gamma font renderer"); // Compute the gamma tables |