diff options
| author | Jason Sams <rjsams@android.com> | 2010-08-25 14:31:48 -0700 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2010-08-25 14:41:20 -0700 |
| commit | 1d45c47975ab2a8cef6db5a8976276de31e1e8d0 (patch) | |
| tree | 1db2203004e52f51e4f0296adf4d4c332ea3dd56 /libs/rs/RenderScript.h | |
| parent | 7462fc738fdaa5095d42f6176940c7111a2a54ac (diff) | |
| download | frameworks_base-1d45c47975ab2a8cef6db5a8976276de31e1e8d0.zip frameworks_base-1d45c47975ab2a8cef6db5a8976276de31e1e8d0.tar.gz frameworks_base-1d45c47975ab2a8cef6db5a8976276de31e1e8d0.tar.bz2 | |
Add matrix component types.
Fix potental overflow in script -> java messages.
Change-Id: Ie6fd9dc376be4043fc938a1517106936937689c8
Diffstat (limited to 'libs/rs/RenderScript.h')
| -rw-r--r-- | libs/rs/RenderScript.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libs/rs/RenderScript.h b/libs/rs/RenderScript.h index 3406287..7902b9a 100644 --- a/libs/rs/RenderScript.h +++ b/libs/rs/RenderScript.h @@ -91,7 +91,11 @@ enum RsDataType { RS_TYPE_UNSIGNED_5_5_5_1, RS_TYPE_UNSIGNED_4_4_4_4, - RS_TYPE_ELEMENT, + RS_TYPE_MATRIX_4X4, + RS_TYPE_MATRIX_3X3, + RS_TYPE_MATRIX_2X2, + + RS_TYPE_ELEMENT = 1000, RS_TYPE_TYPE, RS_TYPE_ALLOCATION, RS_TYPE_SAMPLER, @@ -100,7 +104,7 @@ enum RsDataType { RS_TYPE_PROGRAM_FRAGMENT, RS_TYPE_PROGRAM_VERTEX, RS_TYPE_PROGRAM_RASTER, - RS_TYPE_PROGRAM_STORE + RS_TYPE_PROGRAM_STORE, }; enum RsDataKind { |