diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2011-02-01 09:13:26 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-01 09:13:26 -0800 |
| commit | c078e2cb390eefacdac40e33ca96a89b791272b6 (patch) | |
| tree | 71d6569b7fb10be36bd79d13cc9a26042eabbc77 /libs/rs/rsShaderCache.cpp | |
| parent | e37ce6fe79f2be8046d658f6260ba12542afe015 (diff) | |
| parent | d0f5bd130bdbd5b357b7f1db4562fa55e06d384c (diff) | |
| download | frameworks_base-c078e2cb390eefacdac40e33ca96a89b791272b6.zip frameworks_base-c078e2cb390eefacdac40e33ca96a89b791272b6.tar.gz frameworks_base-c078e2cb390eefacdac40e33ca96a89b791272b6.tar.bz2 | |
Merge "Cleaning up the serialization change. Renaming the define to be more in line with what it does and removing the host stub header file."
Diffstat (limited to 'libs/rs/rsShaderCache.cpp')
| -rw-r--r-- | libs/rs/rsShaderCache.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libs/rs/rsShaderCache.cpp b/libs/rs/rsShaderCache.cpp index b958021..e8d89c2 100644 --- a/libs/rs/rsShaderCache.cpp +++ b/libs/rs/rsShaderCache.cpp @@ -14,14 +14,11 @@ * limitations under the License. */ -#ifndef ANDROID_RS_BUILD_FOR_HOST #include "rsContext.h" +#ifndef ANDROID_RS_SERIALIZE #include <GLES/gl.h> #include <GLES2/gl2.h> -#else -#include "rsContextHostStub.h" -#include <OpenGL/gl.h> -#endif //ANDROID_RS_BUILD_FOR_HOST +#endif //ANDROID_RS_SERIALIZE using namespace android; using namespace android::renderscript; |