summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2013-08-07 17:51:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-07 17:51:54 -0700
commit55db1e1218971105e68ba9d451b2e0b1e9e5f9fb (patch)
tree6100c696986b77fdbb78d802dded0253ad3a9987
parent49660c7c24f24c3394233e3bbf94c96281e8c408 (diff)
parentef54f611c1574c2cca89476494e7343df76aefad (diff)
downloadframeworks_base-55db1e1218971105e68ba9d451b2e0b1e9e5f9fb.zip
frameworks_base-55db1e1218971105e68ba9d451b2e0b1e9e5f9fb.tar.gz
frameworks_base-55db1e1218971105e68ba9d451b2e0b1e9e5f9fb.tar.bz2
am ef54f611: am bdf85de3: am 7b60431b: update <uses-feature> for OpenGL ES version with 3.0 example and API guide link. bug: 10207619
* commit 'ef54f611c1574c2cca89476494e7343df76aefad': update <uses-feature> for OpenGL ES version with 3.0 example and API guide link. bug: 10207619
-rw-r--r--docs/html/guide/topics/manifest/uses-feature-element.jd7
1 files changed, 5 insertions, 2 deletions
diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd
index 4c11adc..af35540 100644
--- a/docs/html/guide/topics/manifest/uses-feature-element.jd
+++ b/docs/html/guide/topics/manifest/uses-feature-element.jd
@@ -163,8 +163,7 @@ feature</em>, if necessary. </li>
<dd>The OpenGL ES version required by the application. The higher 16 bits
represent the major number and the lower 16 bits represent the minor number. For
example, to specify OpenGL ES version 2.0, you would set the value as
-"0x00020000". To specify OpenGL ES 2.1, if/when such a version were made
-available, you would set the value as "0x00020001".
+"0x00020000", or to specify OpenGL ES 3.0, you would set the value as "0x00030000".
<p>An application should specify at most one <code>android:glEsVersion</code>
attribute in its manifest. If it specifies more than one, the
@@ -183,6 +182,10 @@ that it requires OpenGL ES 2.0.</p>
<p>An application that can work with any of several OpenGL ES versions should
only specify the numerically lowest version of OpenGL ES that it requires. (It
can check at run-time whether a higher level of OpenGL ES is available.)</p>
+
+ <p>For more information about using OpenGL ES, including how to check the supported OpenGL ES
+version at runtime, see the <a href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL ES</a>
+API guide.</p>
</dd>
</dl>