diff options
author | Alex Sakhartchouk <alexst@google.com> | 2011-02-28 16:01:28 -0800 |
---|---|---|
committer | Alex Sakhartchouk <alexst@google.com> | 2011-02-28 16:01:28 -0800 |
commit | 347697710d033036c533bd6cee409c4b4c19d437 (patch) | |
tree | 6591c6d014d912cc60b45a8c98f439deaccefbf2 /graphics/java | |
parent | 802e37e7b880c59ad791583baa70819db93b86f7 (diff) | |
download | frameworks_base-347697710d033036c533bd6cee409c4b4c19d437.zip frameworks_base-347697710d033036c533bd6cee409c4b4c19d437.tar.gz frameworks_base-347697710d033036c533bd6cee409c4b4c19d437.tar.bz2 |
Discovered a matrix element bug while writing cts unit tests.
Change-Id: I56709df188a5085611efca804582470340369dc0
Diffstat (limited to 'graphics/java')
-rw-r--r-- | graphics/java/android/renderscript/Element.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/graphics/java/android/renderscript/Element.java b/graphics/java/android/renderscript/Element.java index 4fc419c..fae22f0 100644 --- a/graphics/java/android/renderscript/Element.java +++ b/graphics/java/android/renderscript/Element.java @@ -21,7 +21,7 @@ import android.util.Log; /** * <p>The most basic data type. An element represents one cell of a memory allocation. - * Element is the basic data type of Renderscript. An element can be of two forms: Basic elements or Complex forms. + * Element is the basic data type of Renderscript. An element can be of two forms: Basic elements or Complex forms. * Examples of basic elements are:</p> * <ul> * <li>Single float value</li> @@ -29,7 +29,7 @@ import android.util.Log; * <li>single RGB-565 color</li> * <li>single unsigned int 16</li> * </ul> - * <p>Complex elements contain a list of sub-elements and names that + * <p>Complex elements contain a list of sub-elements and names that * represents a structure of data. The fields can be accessed by name * from a script or shader. The memory layout is defined and ordered. Data * alignment is determinied by the most basic primitive type. i.e. a float4 @@ -403,7 +403,7 @@ public class Element extends BaseObj { if(rs.mElement_MATRIX_3X3 == null) { rs.mElement_MATRIX_3X3 = createUser(rs, DataType.MATRIX_3X3); } - return rs.mElement_MATRIX_4X4; + return rs.mElement_MATRIX_3X3; } public static Element MATRIX_2X2(RenderScript rs) { |