commit 1b913c5c2a8058159b776f9343cf6393b9bd5f18
author Romain Guy <romainguy@google.com> Tue Jul 31 11:35:15 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 31 11:35:15 2012 -0700
tree 94e238f3621a222255c09ae70d855852232bc724
parent a8e770991e8659d775d97f603e8f1a542aa0229e
parent 9f52da21d7d87c36e075432615c85c20bfa5d180

am 9f52da21: Merge "Fix android.opengl.Matrix frustum\'s generation" into jb-mr1-dev

* commit '9f52da21d7d87c36e075432615c85c20bfa5d180':
  Fix android.opengl.Matrix frustum's generation

opengl/java/android/opengl/Matrix.java

diff --git a/opengl/java/android/opengl/Matrix.java b/opengl/java/android/opengl/Matrix.java
index 7c72ae4..3f07337 100644
--- a/opengl/java/android/opengl/Matrix.java
+++ b/opengl/java/android/opengl/Matrix.java
@@ -312,7 +312,6 @@
      * @param near
      * @param far
      */
-
     public static void frustumM(float[] m, int offset,
             float left, float right, float bottom, float top,
             float near, float far) {
@@ -336,10 +335,10 @@
         final float r_depth  = 1.0f / (near - far);
         final float x = 2.0f * (near * r_width);
         final float y = 2.0f * (near * r_height);
-        final float A = 2.0f * ((right + left) * r_width);
+        final float A = (right + left) * r_width;
         final float B = (top + bottom) * r_height;
-        final float C = (far + near) * r_depth;
-        final float D = 2.0f * (far * near * r_depth);
+        final float C = -(far + near) * r_depth;
+        final float D = -2.0f * (far * near * r_depth);
         m[offset + 0] = x;
         m[offset + 5] = y;
         m[offset + 8] = A;