diff options
| author | 2015-02-12 20:32:56 +0000 | |
|---|---|---|
| committer | 2015-02-12 20:32:58 +0000 | |
| commit | d12940797cab9156a43992468ca076932b574f41 (patch) | |
| tree | 4e8b3ee5532c7d2290b9bbedbdac52ad1c13f05d /libs/hwui/Program.cpp | |
| parent | 1ea5736339fef03de09a40ef389c52355b168388 (diff) | |
| parent | 0519c810a56bded1284fcb2ae40f438878c6585f (diff) | |
Merge "Glop Bitmap and RoundRect clipping support"
Diffstat (limited to 'libs/hwui/Program.cpp')
| -rw-r--r-- | libs/hwui/Program.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/Program.cpp b/libs/hwui/Program.cpp index 5f34b3495681..32713e9b36f3 100644 --- a/libs/hwui/Program.cpp +++ b/libs/hwui/Program.cpp @@ -177,12 +177,12 @@ void Program::set(const mat4& projectionMatrix, const mat4& modelViewMatrix, glUniformMatrix4fv(transform, 1, GL_FALSE, &t.data[0]); } -void Program::setColor(const float r, const float g, const float b, const float a) { +void Program::setColor(FloatColor color) { if (!mHasColorUniform) { mColorUniform = getUniform("color"); mHasColorUniform = true; } - glUniform4f(mColorUniform, r, g, b, a); + glUniform4f(mColorUniform, color.r, color.g, color.b, color.a); } void Program::use() { |