summaryrefslogtreecommitdiff
path: root/libs/hwui/Program.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2018-08-07 16:51:24 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-08-07 16:51:24 +0000
commite80b45506501815061b079dcb10bf87443bd385d (patch)
tree4d74a37a2b5bab1dfa593dd0b1565cd42b720c16 /libs/hwui/Program.cpp
parent38c9e614af1f516f44f2a74fb9d0ec6963f809a8 (diff)
parent02857a72198613a0583cdf6863edb2df59beee04 (diff)
Merge "Merge Android Pie into master"
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