diff options
| author | Joe Fernandez <joefernandez@google.com> | 2011-10-28 15:40:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-28 15:40:11 -0700 |
| commit | 09848bc89de999416e2de82a7693b2deec6bf802 (patch) | |
| tree | 640aa493d2b638726055bd32ba470412490b98f4 /opengl/java | |
| parent | c1cf3b160b4852e021a45806d496a9f9a76d6683 (diff) | |
| parent | 61fd1e8d8c3ccf2d6b7d4af1c19e8f0988d5a1ec (diff) | |
| download | frameworks_base-09848bc89de999416e2de82a7693b2deec6bf802.zip frameworks_base-09848bc89de999416e2de82a7693b2deec6bf802.tar.gz frameworks_base-09848bc89de999416e2de82a7693b2deec6bf802.tar.bz2 | |
Merge "docs: add developer guide cross references, Project ACRE, round 3" into ics-mr0
Diffstat (limited to 'opengl/java')
| -rw-r--r-- | opengl/java/android/opengl/GLSurfaceView.java | 13 | ||||
| -rw-r--r-- | opengl/java/android/opengl/package.html | 5 | ||||
| -rw-r--r-- | opengl/java/javax/microedition/khronos/opengles/package.html | 8 |
3 files changed, 25 insertions, 1 deletions
diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java index 4c7f84e..51b7c58 100644 --- a/opengl/java/android/opengl/GLSurfaceView.java +++ b/opengl/java/android/opengl/GLSurfaceView.java @@ -54,6 +54,12 @@ import android.view.SurfaceView; * <li>Optionally wraps, traces, and/or error-checks the renderer's OpenGL calls. * </ul> * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about how to use OpenGL, read the + * <a href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL</a> developer guide.</p> + * </div> + * * <h3>Using GLSurfaceView</h3> * <p> * Typically you use GLSurfaceView by subclassing it and overriding one or more of the @@ -636,6 +642,13 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback * this interface, and then call {@link GLSurfaceView#setRenderer} to * register the renderer with the GLSurfaceView. * <p> + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about how to use OpenGL, read the + * <a href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL</a> developer guide.</p> + * </div> + * * <h3>Threading</h3> * The renderer will be called on a separate thread, so that rendering * performance is decoupled from the UI thread. Clients typically need to diff --git a/opengl/java/android/opengl/package.html b/opengl/java/android/opengl/package.html index 7175b33..3c57af9 100644 --- a/opengl/java/android/opengl/package.html +++ b/opengl/java/android/opengl/package.html @@ -1,5 +1,8 @@ <HTML> <BODY> -Provides OpenGL utilities. +<p>Provides an OpenGL ES static interface and utilities.</p> + +<p>For more information about how to use OpenGL, read the +<a href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL</a> developer guide.</p> </BODY> </HTML> diff --git a/opengl/java/javax/microedition/khronos/opengles/package.html b/opengl/java/javax/microedition/khronos/opengles/package.html new file mode 100644 index 0000000..0e3dbee --- /dev/null +++ b/opengl/java/javax/microedition/khronos/opengles/package.html @@ -0,0 +1,8 @@ +<HTML> +<BODY> +<p>Provides a standard OpenGL interface.</p> + +<p>For more information about how to use OpenGL, read the +<a href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL</a> developer guide.</p> +</BODY> +</HTML>
\ No newline at end of file |