diff options
| author | 2008-12-19 08:31:54 -0800 | |
|---|---|---|
| committer | 2008-12-19 08:31:54 -0800 | |
| commit | 772a89695f179b51d16b26c1b0d946aa3e850e70 (patch) | |
| tree | 9a9fdadd1301625f875a3c126c986c79e3363ac4 /include/GLES/eglnatives.h | |
| parent | d34e59679f6a98e9e67ef4bd18da6e5a86d386bc (diff) | |
| parent | e09fd9e819c23dc90bca68375645e15544861330 (diff) | |
Merge commit 'remotes/korg/cupcake'
Conflicts:
core/java/com/android/internal/app/AlertController.java
core/res/res/values/strings.xml
media/java/android/media/AudioSystem.java
services/java/com/android/server/LocationManagerService.java
Diffstat (limited to 'include/GLES/eglnatives.h')
| -rw-r--r-- | include/GLES/eglnatives.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/GLES/eglnatives.h b/include/GLES/eglnatives.h index f9e544cadc..1cd57d0684 100644 --- a/include/GLES/eglnatives.h +++ b/include/GLES/eglnatives.h @@ -33,7 +33,7 @@ typedef struct egl_native_pixmap_t* NativePixmapType; typedef void* NativeDisplayType; /* - * This a conveniance function to create a NativeWindowType surface + * This a convenience function to create a NativeWindowType surface * that maps to the whole screen * This function is actually implemented in libui.so */ @@ -50,6 +50,7 @@ enum native_pixel_format_t { NATIVE_PIXEL_FORMAT_RGBA_8888 = 1, NATIVE_PIXEL_FORMAT_RGB_565 = 4, + NATIVE_PIXEL_FORMAT_BGRA_8888 = 5, NATIVE_PIXEL_FORMAT_RGBA_5551 = 6, NATIVE_PIXEL_FORMAT_RGBA_4444 = 7, NATIVE_PIXEL_FORMAT_YCbCr_422_SP= 0x10, |