am 1fd97693: Merge change Ia13e890e into eclair

Merge commit '1fd97693dc03fac4e189e5361a7ac7ee033caff2' into eclair-plus-aosp

* commit '1fd97693dc03fac4e189e5361a7ac7ee033caff2':
  Update documentation to indicate EGL ES 2.0 isn't supported in the emulator.
This commit is contained in:
David 'Digit' Turner
2009-12-09 16:07:36 -08:00
committed by Android Git Automerger
2 changed files with 10 additions and 2 deletions

View File

@@ -56,6 +56,10 @@ IMPORTANT CHANGES:
OpenGL ES 2.0 is currently *not* available from Java, and must be used OpenGL ES 2.0 is currently *not* available from Java, and must be used
through native code exclusively. through native code exclusively.
IMPORTANT: OpenGL ES 2.0 is not supported in the Android emulator at this
time. Running/testing any native code that depends on it thus
requires a real device.
- The NDK build script will now remove installed binaries from the application - The NDK build script will now remove installed binaries from the application
project's path before starting the build. This ensures that: project's path before starting the build. This ensures that:

View File

@@ -157,8 +157,7 @@ IV. Android-5 Stable Native APIs:
---------------------------------- ----------------------------------
All the APIs listed below are available for developing native code that runs All the APIs listed below are available for developing native code that runs
on the Eclair experimental branch, which will be used to make the next official on Android 2.0 system images and above.
platform system images.
The OpenGL ES 2.0 Library: The OpenGL ES 2.0 Library:
@@ -183,3 +182,8 @@ http://android-developers.blogspot.com/2009/04/introducing-glsurfaceview.html
The "hello-gl2" sample application demonstrate this. It is used to draw a very The "hello-gl2" sample application demonstrate this. It is used to draw a very
simple triangle with the help of a vertex and fragment shaders. simple triangle with the help of a vertex and fragment shaders.
IMPORTANT NOTE:
The Android emulator does not support OpenGL ES 2.0 hardware emulation
at this time. Running and testing code that uses this API requires a
real device with such capabilities.