diff options
| author | Joe Fernandez <joefernandez@google.com> | 2013-04-10 14:28:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-10 14:28:15 -0700 |
| commit | 0b6162e148db58ff8f8a5f0a3422933cd0005216 (patch) | |
| tree | 516e428e6711daa1eec9e42e3f4103b161db4c32 /docs/html | |
| parent | 7104fda428133e9ddfd859644b7cc6bef7479c4d (diff) | |
| parent | 3f156d7331a0932755cea431b5c681f451055fdf (diff) | |
| download | frameworks_base-0b6162e148db58ff8f8a5f0a3422933cd0005216.zip frameworks_base-0b6162e148db58ff8f8a5f0a3422933cd0005216.tar.gz frameworks_base-0b6162e148db58ff8f8a5f0a3422933cd0005216.tar.bz2 | |
am 3f156d73: am 12ee56aa: am 5f27b486: am 53bbb4ff: Merge "docs: OpenGL Dev Guide, fix bug: 6104328" into jb-mr1.1-docs
* commit '3f156d7331a0932755cea431b5c681f451055fdf':
docs: OpenGL Dev Guide, fix bug: 6104328
Diffstat (limited to 'docs/html')
| -rw-r--r-- | docs/html/guide/topics/graphics/opengl.jd | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/docs/html/guide/topics/graphics/opengl.jd b/docs/html/guide/topics/graphics/opengl.jd index 5630e63..3ec71b2 100644 --- a/docs/html/guide/topics/graphics/opengl.jd +++ b/docs/html/guide/topics/graphics/opengl.jd @@ -138,7 +138,7 @@ calling OpenGL APIs using the following classes:</p> <li>{@link android.opengl.GLES10}</li> <li>{@link android.opengl.GLES10Ext}</li> <li>{@link android.opengl.GLES11}</li> - <li>{@link android.opengl.GLES10Ext}</li> + <li>{@link android.opengl.GLES11Ext}</li> </ul> </li> <li>{@link javax.microedition.khronos.opengles} - This package provides the standard @@ -289,13 +289,14 @@ matrices to the coordinates of objects that use this shader. private final String vertexShaderCode = // This matrix member variable provides a hook to manipulate - // the coordinates of objects that use this vertex shader + // the coordinates of objects that use this vertex shader. "uniform mat4 uMVPMatrix; \n" + "attribute vec4 vPosition; \n" + "void main(){ \n" + - - // the matrix must be included as part of gl_Position + // The matrix must be included as part of gl_Position + // Note that the uMVPMatrix factor *must be first* in order + // for the matrix multiplication product to be correct. " gl_Position = uMVPMatrix * vPosition; \n" + "} \n"; |