commit a8c386f1c36e916c1df18d41a22104d655a89817
author Mathias Agopian <mathias@google.com> Mon Aug 26 20:42:07 2013 -0700
committer Mathias Agopian <mathias@google.com> Mon Aug 26 20:42:07 2013 -0700
tree a977cda0700d7680a7db16eaeacf85c0ac7777ab
parent 595ea77f6bdb5e9d0ddd3305da7a44b56f326b2c

switch to use mat4

Change-Id: I8283a989cfd2b74d53958150bc90298bc083fee7

services/surfaceflinger/RenderEngine/Texture.cpp

diff --git a/services/surfaceflinger/RenderEngine/Texture.cpp b/services/surfaceflinger/RenderEngine/Texture.cpp
index 2cb3b65..8875b6d 100644
--- a/services/surfaceflinger/RenderEngine/Texture.cpp
+++ b/services/surfaceflinger/RenderEngine/Texture.cpp
@@ -23,15 +23,11 @@
 Texture::Texture() :
     mTextureName(0), mTextureTarget(TEXTURE_2D),
     mWidth(0), mHeight(0), mFiltering(false) {
-    const float m[16] = {1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1 };
-    memcpy(mTextureMatrix, m, sizeof(mTextureMatrix));
 }
 
 Texture::Texture(Target textureTarget, uint32_t textureName) :
             mTextureName(textureName), mTextureTarget(textureTarget),
             mWidth(0), mHeight(0), mFiltering(false) {
-    const float m[16] = {1,0,0,0, 0,1,0,0, 0,0,1,0, 0,0,0,1 };
-    memcpy(mTextureMatrix, m, sizeof(mTextureMatrix));
 }
 
 void Texture::init(Target textureTarget, uint32_t textureName) {
@@ -44,7 +40,7 @@
 
 
 void Texture::setMatrix(float const* matrix) {
-    memcpy(mTextureMatrix, matrix, sizeof(mTextureMatrix));
+    mTextureMatrix = mat4(matrix);
 }
 
 void Texture::setFiltering(bool enabled) {
@@ -64,7 +60,7 @@
     return mTextureTarget;
 }
 
-float const* Texture::getMatrix() const {
+const mat4& Texture::getMatrix() const {
     return mTextureMatrix;
 }