diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2011-01-31 14:53:24 -0800 |
|---|---|---|
| committer | Alex Sakhartchouk <alexst@google.com> | 2011-01-31 14:53:24 -0800 |
| commit | 77d9f4bd05b2d2a161f30c12a2248f9c97eaac42 (patch) | |
| tree | 3a709b9ac16afd941095e64fa961e4387f9175ee /rsComponent.cpp | |
| parent | 099d7d33e55afeb3399f6e8cf8d665223ca94939 (diff) | |
| download | rs-77d9f4bd05b2d2a161f30c12a2248f9c97eaac42.tar.gz | |
Cleaning up the serialization change.
Renaming the define to be more in line with what it does and removing the host stub header file.
Change-Id: Ibd3a0a6a398c7f81cc661f71e4478707fe1679ed
Diffstat (limited to 'rsComponent.cpp')
| -rw-r--r-- | rsComponent.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rsComponent.cpp b/rsComponent.cpp index cb3caf80..4c4987aa 100644 --- a/rsComponent.cpp +++ b/rsComponent.cpp @@ -16,7 +16,7 @@ #include "rsComponent.h" -#ifndef ANDROID_RS_BUILD_FOR_HOST +#ifndef ANDROID_RS_SERIALIZE #include <GLES/gl.h> #endif @@ -181,7 +181,7 @@ bool Component::isReference() const { } uint32_t Component::getGLType() const { -#ifndef ANDROID_RS_BUILD_FOR_HOST +#ifndef ANDROID_RS_SERIALIZE switch (mType) { case RS_TYPE_UNSIGNED_5_6_5: return GL_UNSIGNED_SHORT_5_6_5; case RS_TYPE_UNSIGNED_5_5_5_1: return GL_UNSIGNED_SHORT_5_5_5_1; @@ -195,12 +195,12 @@ uint32_t Component::getGLType() const { case RS_TYPE_SIGNED_16: return GL_SHORT; default: break; } -#endif //ANDROID_RS_BUILD_FOR_HOST +#endif //ANDROID_RS_SERIALIZE return 0; } uint32_t Component::getGLFormat() const { -#ifndef ANDROID_RS_BUILD_FOR_HOST +#ifndef ANDROID_RS_SERIALIZE switch (mKind) { case RS_KIND_PIXEL_L: return GL_LUMINANCE; case RS_KIND_PIXEL_A: return GL_ALPHA; @@ -209,7 +209,7 @@ uint32_t Component::getGLFormat() const { case RS_KIND_PIXEL_RGBA: return GL_RGBA; default: break; } -#endif //ANDROID_RS_BUILD_FOR_HOST +#endif //ANDROID_RS_SERIALIZE return 0; } |