diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2011-11-07 09:53:28 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-07 09:53:28 -0800 |
| commit | 9829cceca11a0fc92ab1318ce32b4d4dae8d347d (patch) | |
| tree | c610620dfbbed5e4a2b7509337374c966cecb29d /opengl/java | |
| parent | 01b35d7b1c70e23b89fe642577ef2e2446bde12a (diff) | |
| parent | fc5e224e8dcc878606e47ba3d834be0a79498ac6 (diff) | |
| download | frameworks_base-9829cceca11a0fc92ab1318ce32b4d4dae8d347d.zip frameworks_base-9829cceca11a0fc92ab1318ce32b4d4dae8d347d.tar.gz frameworks_base-9829cceca11a0fc92ab1318ce32b4d4dae8d347d.tar.bz2 | |
Merge "Properly passing an unused variable through."
Diffstat (limited to 'opengl/java')
| -rw-r--r-- | opengl/java/android/opengl/ETC1Util.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/java/android/opengl/ETC1Util.java b/opengl/java/android/opengl/ETC1Util.java index 3629d41..e343c97 100644 --- a/opengl/java/android/opengl/ETC1Util.java +++ b/opengl/java/android/opengl/ETC1Util.java @@ -193,7 +193,7 @@ public class ETC1Util { int encodedImageSize = ETC1.getEncodedDataSize(width, height); ByteBuffer compressedImage = ByteBuffer.allocateDirect(encodedImageSize). order(ByteOrder.nativeOrder()); - ETC1.encodeImage(input, width, height, 3, stride, compressedImage); + ETC1.encodeImage(input, width, height, pixelSize, stride, compressedImage); return new ETC1Texture(width, height, compressedImage); } |