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 /rsProgramFragment.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 'rsProgramFragment.cpp')
-rw-r--r-- | rsProgramFragment.cpp | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/rsProgramFragment.cpp b/rsProgramFragment.cpp index c3fd5c5a..8151f061 100644 --- a/rsProgramFragment.cpp +++ b/rsProgramFragment.cpp @@ -14,13 +14,19 @@ * limitations under the License. */ +#ifndef ANDROID_RS_BUILD_FOR_HOST #include "rsContext.h" -#include "rsProgramFragment.h" - #include <GLES/gl.h> #include <GLES/glext.h> #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 + +#include "rsProgramFragment.h" using namespace android; using namespace android::renderscript; @@ -83,12 +89,15 @@ void ProgramFragment::setupGL(const Context *rsc, ProgramFragmentState *state) glEnable(GL_TEXTURE_2D); if (rsc->checkVersion1_1()) { +#ifndef ANDROID_RS_BUILD_FOR_HOST // These are GLES only if (mPointSpriteEnable) { glEnable(GL_POINT_SPRITE_OES); } else { glDisable(GL_POINT_SPRITE_OES); } glTexEnvi(GL_POINT_SPRITE_OES, GL_COORD_REPLACE_OES, mPointSpriteEnable); +#endif //ANDROID_RS_BUILD_FOR_HOST + } mTextures[ct]->uploadCheck(rsc); glBindTexture(GL_TEXTURE_2D, mTextures[ct]->getTextureID()); @@ -289,6 +298,16 @@ void ProgramFragment::init(Context *rsc) createShader(); } +void ProgramFragment::serialize(OStream *stream) const +{ + +} + +ProgramFragment *ProgramFragment::createFromStream(Context *rsc, IStream *stream) +{ + return NULL; +} + ProgramFragmentState::ProgramFragmentState() { mPF = NULL; |