diff options
| author | 2009-06-05 15:45:39 -0700 | |
|---|---|---|
| committer | 2009-06-05 15:45:39 -0700 | |
| commit | 51c8a3e00e6cffe42d25d1ac87d417e925d8a84d (patch) | |
| tree | a3c8e8f3c90fd0c1aeb661bcf9fa32a2d43649cc /libs/rs/RenderScript.h | |
| parent | eb22c5b358af775a5f1192fc248594c7a0025d56 (diff) | |
| parent | e583a4ea8c90105eee9b408d39bca3a4af6a2569 (diff) | |
Merge commit 'goog/master' into merge_master
Diffstat (limited to 'libs/rs/RenderScript.h')
| -rw-r--r-- | libs/rs/RenderScript.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/rs/RenderScript.h b/libs/rs/RenderScript.h index 378fcccb35c6..2b3341983adf 100644 --- a/libs/rs/RenderScript.h +++ b/libs/rs/RenderScript.h @@ -86,14 +86,14 @@ enum RsElementPredefined { RS_ELEMENT_USER_I32, RS_ELEMENT_USER_FLOAT, - RS_ELEMENT_A_8, - RS_ELEMENT_RGB_565, - RS_ELEMENT_RGBA_5551, - RS_ELEMENT_RGBA_4444, - RS_ELEMENT_RGB_888, - RS_ELEMENT_RGBA_8888, - - RS_ELEMENT_INDEX_16, + RS_ELEMENT_A_8, // 7 + RS_ELEMENT_RGB_565, // 8 + RS_ELEMENT_RGBA_5551, // 9 + RS_ELEMENT_RGBA_4444, // 10 + RS_ELEMENT_RGB_888, // 11 + RS_ELEMENT_RGBA_8888, // 12 + + RS_ELEMENT_INDEX_16, //13 RS_ELEMENT_INDEX_32, RS_ELEMENT_XY_F32, RS_ELEMENT_XYZ_F32, |