diff options
author | Alex Sakhartchouk <alexst@google.com> | 2010-05-21 12:53:13 -0700 |
---|---|---|
committer | Alex Sakhartchouk <alexst@google.com> | 2010-05-21 14:00:10 -0700 |
commit | fb6b614bcea88a587a7ea4530be45ff0ffa0210e (patch) | |
tree | a2a4b9bd296205421c718f1581e9b5824c7305ee /rsProgramStore.cpp | |
parent | 66070bf7aae61cedde97cfdeb6a64f435abe8cde (diff) | |
download | rs-fb6b614bcea88a587a7ea4530be45ff0ffa0210e.tar.gz |
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
Diffstat (limited to 'rsProgramStore.cpp')
-rw-r--r-- | rsProgramStore.cpp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/rsProgramStore.cpp b/rsProgramStore.cpp index ff70509a..e741c0a5 100644 --- a/rsProgramStore.cpp +++ b/rsProgramStore.cpp @@ -14,11 +14,17 @@ * limitations under the License. */ +#ifndef ANDROID_RS_BUILD_FOR_HOST #include "rsContext.h" -#include "rsProgramStore.h" - #include <GLES/gl.h> #include <GLES/glext.h> +#else +#include "rsContextHostStub.h" +#include <OpenGL/gl.h> +#include <OpenGl/glext.h> +#endif //ANDROID_RS_BUILD_FOR_HOST + +#include "rsProgramStore.h" using namespace android; using namespace android::renderscript; @@ -126,6 +132,17 @@ void ProgramStore::setDitherEnable(bool enable) mDitherEnable = enable; } +void ProgramStore::serialize(OStream *stream) const +{ + +} + +ProgramStore *ProgramStore::createFromStream(Context *rsc, IStream *stream) +{ + return NULL; +} + + void ProgramStore::setDepthFunc(RsDepthFunc func) { mDepthTestEnable = true; |