diff options
| author | 2010-05-21 12:53:13 -0700 | |
|---|---|---|
| committer | 2010-05-21 14:00:10 -0700 | |
| commit | aa7d2884cb563f87294003981e03e37a1abeb961 (patch) | |
| tree | 85e27332bc586e3eae0ea334e624920de27687cd /libs/rs/rsShaderCache.cpp | |
| parent | dd56b39ec000b3ddd206d242b0fe24b4b955c8ee (diff) | |
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/rsShaderCache.cpp')
| -rw-r--r-- | libs/rs/rsShaderCache.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/rs/rsShaderCache.cpp b/libs/rs/rsShaderCache.cpp index 4711d1b1ebf8..0218dc5fa3e7 100644 --- a/libs/rs/rsShaderCache.cpp +++ b/libs/rs/rsShaderCache.cpp @@ -14,10 +14,14 @@ * limitations under the License. */ +#ifndef ANDROID_RS_BUILD_FOR_HOST #include "rsContext.h" - #include <GLES/gl.h> #include <GLES2/gl2.h> +#else +#include "rsContextHostStub.h" +#include <OpenGL/gl.h> +#endif //ANDROID_RS_BUILD_FOR_HOST using namespace android; using namespace android::renderscript; |