summaryrefslogtreecommitdiff
path: root/libs/hwui/Program.cpp
diff options
context:
space:
mode:
author John Reck <jreck@google.com> 2017-11-03 21:57:24 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-11-03 21:57:24 +0000
commit0b1b62d27f7a96af7eca739cb4e08e7caf8b6b3c (patch)
treea5581fc1031604d4df46bcc6ec8c361319d45a90 /libs/hwui/Program.cpp
parentf9ba65ac52062c9719c78b3a8503f77e84b756ce (diff)
parent1bcacfdcab0eaa0cee92bd7f5a1b5e271dd68e52 (diff)
Merge changes Id23aa4ec,Ieb6c8b51
* changes: Format the world (or just HWUI) Add .clang-format file
Diffstat (limited to 'libs/hwui/Program.cpp')
-rw-r--r--libs/hwui/Program.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/hwui/Program.cpp b/libs/hwui/Program.cpp
index e43b80d440e7..052798b9cea9 100644
--- a/libs/hwui/Program.cpp
+++ b/libs/hwui/Program.cpp
@@ -151,7 +151,7 @@ GLuint Program::buildShader(const char* source, GLenum type) {
}
void Program::set(const mat4& projectionMatrix, const mat4& modelViewMatrix,
- const mat4& transformMatrix, bool offset) {
+ const mat4& transformMatrix, bool offset) {
if (projectionMatrix != mProjection || offset != mOffset) {
if (CC_LIKELY(!offset)) {
glUniformMatrix4fv(projection, 1, GL_FALSE, &projectionMatrix.data[0]);
@@ -195,5 +195,5 @@ void Program::remove() {
mUse = false;
}
-}; // namespace uirenderer
-}; // namespace android
+}; // namespace uirenderer
+}; // namespace android