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 | d0f5bd130bdbd5b357b7f1db4562fa55e06d384c (patch) | |
| tree | 48ee3f26d8879c2a92b8ee60df9821d46666e9e2 /libs/rs/rsProgram.cpp | |
| parent | e62e890b68cce46b4ed19010874707d3d45fa258 (diff) | |
| download | frameworks_base-d0f5bd130bdbd5b357b7f1db4562fa55e06d384c.zip frameworks_base-d0f5bd130bdbd5b357b7f1db4562fa55e06d384c.tar.gz frameworks_base-d0f5bd130bdbd5b357b7f1db4562fa55e06d384c.tar.bz2 | |
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 'libs/rs/rsProgram.cpp')
| -rw-r--r-- | libs/rs/rsProgram.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libs/rs/rsProgram.cpp b/libs/rs/rsProgram.cpp index 39b85e3..4ef05bf 100644 --- a/libs/rs/rsProgram.cpp +++ b/libs/rs/rsProgram.cpp @@ -14,15 +14,11 @@ * limitations under the License. */ -#ifndef ANDROID_RS_BUILD_FOR_HOST #include "rsContext.h" +#ifndef ANDROID_RS_SERIALIZE #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> -#else -#include "rsContextHostStub.h" -#include <OpenGL/gl.h> -#include <OpenGL/glext.h> -#endif //ANDROID_RS_BUILD_FOR_HOST +#endif //ANDROID_RS_SERIALIZE #include "rsProgram.h" |