summaryrefslogtreecommitdiff
path: root/libs/hwui/Program.cpp
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2015-02-11 13:17:06 -0800
committerChris Craik <ccraik@google.com>2015-02-12 12:30:59 -0800
commit0519c810a56bded1284fcb2ae40f438878c6585f (patch)
treed5e0a81ea08b9f3fc9d5e8d78b770a8c77aa4535 /libs/hwui/Program.cpp
parent08fa43fdeb646f56edcd8b33d06ee7d79b203426 (diff)
Glop Bitmap and RoundRect clipping support
Change-Id: I4577546a5d2e5f084cc03f39a89db9231b8111ee
Diffstat (limited to 'libs/hwui/Program.cpp')
-rw-r--r--libs/hwui/Program.cpp4
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() {