commit 049c1147a12684a6f95c6d8b326dc29208908d14
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Oct 06 00:40:37 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 06 00:40:37 2017 +0000
tree 554beeccbb0642960fcc5ee22d3ae48d66edfb00
parent d2c0820d84585ad63c54d596b8de87a3fbc863bc
parent 89e197aa8d92f519643fa8a4f0b5128e7e57ea34

Merge "Convert half4 color to float array for buffer copy"

services/surfaceflinger/RenderEngine/Program.cpp

diff --git a/services/surfaceflinger/RenderEngine/Program.cpp b/services/surfaceflinger/RenderEngine/Program.cpp
index e95a6c5..bd2188b 100644
--- a/services/surfaceflinger/RenderEngine/Program.cpp
+++ b/services/surfaceflinger/RenderEngine/Program.cpp
@@ -133,7 +133,7 @@
         glUniformMatrix4fv(mTextureMatrixLoc, 1, GL_FALSE, desc.mTexture.getMatrix().asArray());
     }
     if (mColorLoc >= 0) {
-        const float* color = &static_cast<details::TVec4<float> const &>(desc.mColor)[0];
+        const float color[4] = {desc.mColor.r, desc.mColor.g, desc.mColor.b, desc.mColor.a};
         glUniform4fv(mColorLoc, 1, color);
     }
     if (mColorMatrixLoc >= 0) {