Android Chromoting: Directly pass model view projection matrix to the CardboardActivityEyePoint draw method.

BUG=516871

Review URL: https://codereview.chromium.org/1321243002

Cr-Commit-Position: refs/heads/master@{#346489}

2 files changed, 3 insertions, 12 deletions

diff --git a/remoting/android/java/src/org/chromium/chromoting/CardboardActivityEyePoint.java b/remoting/android/java/src/org/chromium/chromoting/CardboardActivityEyePoint.java
index 57d02b5..0312cad 100644
--- a/remoting/android/java/src/org/chromium/chromoting/CardboardActivityEyePoint.java
+++ b/remoting/android/java/src/org/chromium/chromoting/CardboardActivityEyePoint.java
@@ -33,7 +33,6 @@ public class CardboardActivityEyePoint {
     private int mProgramHandle;
     private int mCombinedMatrixHandle;
     private int mPositionHandle;
-    private float[] mCombinedMatrix;
 
     public CardboardActivityEyePoint() {
         // Set handlers for eye point drawing.
@@ -50,22 +49,15 @@ public class CardboardActivityEyePoint {
     }
 
     /**
-     * Set up model view projection matrix.
-     */
-    public void setCombinedMatrix(float[] combinedMatrix) {
-        mCombinedMatrix = combinedMatrix.clone();
-    }
-
-    /**
      * Draw the eye point based on given model view projection matrix.
      */
-    public void draw() {
+    public void draw(float[] combinedMatrix) {
         GLES20.glUseProgram(mProgramHandle);
 
         // Set the eye point in front of desktop.
         GLES20.glClear(GLES20.GL_DEPTH_BUFFER_BIT);
 
-        GLES20.glUniformMatrix4fv(mCombinedMatrixHandle, 1, false, mCombinedMatrix, 0);
+        GLES20.glUniformMatrix4fv(mCombinedMatrixHandle, 1, false, combinedMatrix, 0);
 
         GLES20.glVertexAttrib4f(mPositionHandle, 0.0f, 0.0f, 0.0f, 1.0f);
 
diff --git a/remoting/android/java/src/org/chromium/chromoting/CardboardDesktopRenderer.java b/remoting/android/java/src/org/chromium/chromoting/CardboardDesktopRenderer.java
index b034d5a..438192db 100644
--- a/remoting/android/java/src/org/chromium/chromoting/CardboardDesktopRenderer.java
+++ b/remoting/android/java/src/org/chromium/chromoting/CardboardDesktopRenderer.java
@@ -217,8 +217,7 @@ public class CardboardDesktopRenderer implements CardboardView.StereoRenderer {
         Matrix.multiplyMM(mEyePointCombinedMatrix, 0, mProjectionMatrix,
                 0, mEyePointCombinedMatrix, 0);
 
-        mEyePoint.setCombinedMatrix(mEyePointCombinedMatrix);
-        mEyePoint.draw();
+        mEyePoint.draw(mEyePointCombinedMatrix);
     }
 
     private void drawSkybox() {