diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2010-05-21 12:53:13 -0700 |
|---|---|---|
| committer | Alex Sakhartchouk <alexst@google.com> | 2010-05-21 14:00:10 -0700 |
| commit | aa7d2884cb563f87294003981e03e37a1abeb961 (patch) | |
| tree | 85e27332bc586e3eae0ea334e624920de27687cd /libs/rs/rsUtils.h | |
| parent | dd56b39ec000b3ddd206d242b0fe24b4b955c8ee (diff) | |
| download | frameworks_base-aa7d2884cb563f87294003981e03e37a1abeb961.zip frameworks_base-aa7d2884cb563f87294003981e03e37a1abeb961.tar.gz frameworks_base-aa7d2884cb563f87294003981e03e37a1abeb961.tar.bz2 | |
Removed unnecessary change based on comments.
Now using android utils lib.
collada_to_a3d seems to work with android util libs.
Integrating old changelist
Changing assert to rsAssrt in VertexArray
making context compile.
Change-Id: I33890defa777f09253bfab630d97782359ec49d7
Added serialization code to rsLib
Integrated old changelist
Change-Id: Ie4746113f6d1817fbb3264f97fdddde25b779311
Added serialization code to rsLib
Change-Id: Ie4746113f6d1817fbb3264f97fdddde25b779311
Diffstat (limited to 'libs/rs/rsUtils.h')
| -rw-r--r-- | libs/rs/rsUtils.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libs/rs/rsUtils.h b/libs/rs/rsUtils.h index adddf49..7ea3b61 100644 --- a/libs/rs/rsUtils.h +++ b/libs/rs/rsUtils.h @@ -19,15 +19,23 @@ #define LOG_NDEBUG 0 #define LOG_TAG "RenderScript" + #include <utils/Log.h> -#include <utils/Vector.h> -#include <utils/KeyedVector.h> + +#include "rsStream.h" +#include "rsFileA3DDecls.h" + #include <utils/String8.h> +#include <utils/Vector.h> + #include <stdlib.h> #include <pthread.h> #include <time.h> +#ifndef ANDROID_RS_BUILD_FOR_HOST #include <EGL/egl.h> +#endif + #include <math.h> #include "RenderScript.h" |