From aa7d2884cb563f87294003981e03e37a1abeb961 Mon Sep 17 00:00:00 2001 From: Alex Sakhartchouk Date: Fri, 21 May 2010 12:53:13 -0700 Subject: 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 --- libs/rs/rsProgramRaster.cpp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'libs/rs/rsProgramRaster.cpp') diff --git a/libs/rs/rsProgramRaster.cpp b/libs/rs/rsProgramRaster.cpp index c095635652c4..66f6ef83a255 100644 --- a/libs/rs/rsProgramRaster.cpp +++ b/libs/rs/rsProgramRaster.cpp @@ -14,11 +14,17 @@ * limitations under the License. */ +#ifndef ANDROID_RS_BUILD_FOR_HOST #include "rsContext.h" -#include "rsProgramRaster.h" - #include #include +#else +#include "rsContextHostStub.h" +#include +#include +#endif //ANDROID_RS_BUILD_FOR_HOST + +#include "rsProgramRaster.h" using namespace android; using namespace android::renderscript; @@ -76,11 +82,13 @@ void ProgramRaster::setupGL(const Context *rsc, ProgramRasterState *state) } if (rsc->checkVersion1_1()) { +#ifndef ANDROID_RS_BUILD_FOR_HOST if (mPointSprite) { glEnable(GL_POINT_SPRITE_OES); } else { glDisable(GL_POINT_SPRITE_OES); } +#endif //ANDROID_RS_BUILD_FOR_HOST } } @@ -92,7 +100,15 @@ void ProgramRaster::setupGL2(const Context *rsc, ProgramRasterState *state) state->mLast.set(this); } +void ProgramRaster::serialize(OStream *stream) const +{ + +} +ProgramRaster *ProgramRaster::createFromStream(Context *rsc, IStream *stream) +{ + return NULL; +} ProgramRasterState::ProgramRasterState() { -- cgit v1.2.3-59-g8ed1b