From 694b519ac647fe998fd396fe0784cc8e179aadc4 Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Wed, 21 Jul 2010 21:33:20 -0700 Subject: Add text rendering. Change-Id: Ibe5a9fa844d531b31b55e43de403a98d49f659b9 --- libs/hwui/Program.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'libs/hwui/Program.cpp') diff --git a/libs/hwui/Program.cpp b/libs/hwui/Program.cpp index 841b6c842f9a..6e608084f5bb 100644 --- a/libs/hwui/Program.cpp +++ b/libs/hwui/Program.cpp @@ -33,6 +33,8 @@ namespace uirenderer { #include "shaders/drawTexture.vert" #include "shaders/drawTexture.frag" +#include "shaders/drawText.frag" + #include "shaders/drawLinearGradient.vert" #include "shaders/drawLinearGradient.frag" @@ -169,6 +171,12 @@ DrawTextureProgram::DrawTextureProgram(): sampler = addUniform("sampler"); } +DrawTextureProgram::DrawTextureProgram(const char* vertex, const char* fragment): + DrawColorProgram(vertex, fragment) { + texCoords = addAttrib("texCoords"); + sampler = addUniform("sampler"); +} + void DrawTextureProgram::use() { DrawColorProgram::use(); glActiveTexture(GL_TEXTURE0); @@ -181,6 +189,14 @@ void DrawTextureProgram::remove() { glDisableVertexAttribArray(texCoords); } +/////////////////////////////////////////////////////////////////////////////// +// Draw text +/////////////////////////////////////////////////////////////////////////////// + +DrawTextProgram::DrawTextProgram(): + DrawTextureProgram(gDrawTextureVertexShader, gDrawTextFragmentShader) { +} + /////////////////////////////////////////////////////////////////////////////// // Draw linear gradient /////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3-59-g8ed1b