diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2010-10-05 15:32:38 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-05 15:32:38 -0700 |
| commit | eccce09f1ed5d3704601e4dad0ed9ca4184849a9 (patch) | |
| tree | 69df31ca8447f2dfd114adde7b764a241db4e06e /libs/rs/RenderScript.h | |
| parent | 2e292e9da496874229f5f13fac2d6b48228ff691 (diff) | |
| parent | 76322af2a6c109a79431f019dcef6e038c030686 (diff) | |
| download | frameworks_base-eccce09f1ed5d3704601e4dad0ed9ca4184849a9.zip frameworks_base-eccce09f1ed5d3704601e4dad0ed9ca4184849a9.tar.gz frameworks_base-eccce09f1ed5d3704601e4dad0ed9ca4184849a9.tar.bz2 | |
Merge "Adding average fps counter. Removing rsLight from libRS"
Diffstat (limited to 'libs/rs/RenderScript.h')
| -rw-r--r-- | libs/rs/RenderScript.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libs/rs/RenderScript.h b/libs/rs/RenderScript.h index 13ae1fb..66e27f3 100644 --- a/libs/rs/RenderScript.h +++ b/libs/rs/RenderScript.h @@ -40,7 +40,6 @@ typedef void * RsSampler; typedef void * RsScript; typedef void * RsMesh; typedef void * RsType; -typedef void * RsLight; typedef void * RsObjectBase; typedef void * RsProgram; @@ -242,7 +241,6 @@ enum RsA3DClassID { RS_A3D_CLASS_ID_PROGRAM_STORE, RS_A3D_CLASS_ID_SAMPLER, RS_A3D_CLASS_ID_ANIMATION, - RS_A3D_CLASS_ID_LIGHT, RS_A3D_CLASS_ID_ADAPTER_1D, RS_A3D_CLASS_ID_ADAPTER_2D, RS_A3D_CLASS_ID_SCRIPT_C |