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/rsDevice.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libs/rs/rsDevice.cpp') diff --git a/libs/rs/rsDevice.cpp b/libs/rs/rsDevice.cpp index b670ad4..a96b114 100644 --- a/libs/rs/rsDevice.cpp +++ b/libs/rs/rsDevice.cpp @@ -15,7 +15,11 @@ */ #include "rsDevice.h" +#ifndef ANDROID_RS_BUILD_FOR_HOST #include "rsContext.h" +#else +#include "rsContextHostStub.h" +#endif using namespace android; using namespace android::renderscript; @@ -33,7 +37,7 @@ Device::~Device() void Device::addContext(Context *rsc) { - mContexts.add(rsc); + mContexts.push(rsc); } void Device::removeContext(Context *rsc) -- cgit v1.1