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 /rsSampler.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 'rsSampler.cpp')
| -rw-r--r-- | rsSampler.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/rsSampler.cpp b/rsSampler.cpp index 71f508fa..f41f295b 100644 --- a/rsSampler.cpp +++ b/rsSampler.cpp @@ -14,10 +14,16 @@ * limitations under the License. */ +#ifndef ANDROID_RS_BUILD_FOR_HOST #include <GLES/gl.h> #include <GLES/glext.h> - #include "rsContext.h" +#else +#include "rsContextHostStub.h" +#include <OpenGL/gl.h> +#include <OpenGL/glext.h> +#endif //ANDROID_RS_BUILD_FOR_HOST + #include "rsSampler.h" @@ -94,6 +100,17 @@ void Sampler::unbindFromContext(SamplerState *ss) mBoundSlot = -1; ss->mSamplers[slot].clear(); } + +void Sampler::serialize(OStream *stream) const +{ + +} + +Sampler *Sampler::createFromStream(Context *rsc, IStream *stream) +{ + return NULL; +} + /* void SamplerState::setupGL() { |