diff options
| author | Jason Sams <rjsams@android.com> | 2009-07-02 15:09:27 -0700 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2009-07-02 15:09:27 -0700 |
| commit | 4244afa87edf8f2dde0f053f31f39f54c0fa1783 (patch) | |
| tree | 473fd78029bb27ef6aa5ee8c67e39d6356cb0454 /libs/rs/rsScriptC.cpp | |
| parent | aabd00960f3b98c3c5636d99212343d71956a1d1 (diff) | |
| download | frameworks_base-4244afa87edf8f2dde0f053f31f39f54c0fa1783.zip frameworks_base-4244afa87edf8f2dde0f053f31f39f54c0fa1783.tar.gz frameworks_base-4244afa87edf8f2dde0f053f31f39f54c0fa1783.tar.bz2 | |
Add support for multitexture and fix allocation ref counting bug in RS. Add plaque to rollo and leave it disabled due to ugly appearance.
Diffstat (limited to 'libs/rs/rsScriptC.cpp')
| -rw-r--r-- | libs/rs/rsScriptC.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libs/rs/rsScriptC.cpp b/libs/rs/rsScriptC.cpp index 55daf7e..0ec6baf 100644 --- a/libs/rs/rsScriptC.cpp +++ b/libs/rs/rsScriptC.cpp @@ -334,12 +334,19 @@ extern "C" void drawQuad(int32_t x1, int32_t y1, int32_t z1, //glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, tm->mBufferObjects[1]); glEnableClientState(GL_VERTEX_ARRAY); + glVertexPointer(3, GL_FIXED, 0, vtx); + + glClientActiveTexture(GL_TEXTURE0); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + glTexCoordPointer(2, GL_FIXED, 0, tex); + glClientActiveTexture(GL_TEXTURE1); glEnableClientState(GL_TEXTURE_COORD_ARRAY); + glTexCoordPointer(2, GL_FIXED, 0, tex); + glClientActiveTexture(GL_TEXTURE0); + glDisableClientState(GL_NORMAL_ARRAY); glDisableClientState(GL_COLOR_ARRAY); - glVertexPointer(3, GL_FIXED, 0, vtx); - glTexCoordPointer(2, GL_FIXED, 0, tex); //glColorPointer(4, GL_UNSIGNED_BYTE, 12, ptr); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); |