diff options
| author | Jason Sams <rjsams@android.com> | 2010-01-25 12:31:24 -0800 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2010-01-25 12:41:19 -0800 |
| commit | df48b571144ed0b0a09c735f997cc408c3d22b2b (patch) | |
| tree | 3c4b6ccdf272b3dde00725c83078306a7df57e9b /libs/rs/rsScriptC_Lib.cpp | |
| parent | 882652bf0d78ef06635621a11a07690b7c682a7b (diff) | |
Cleanup seperation of Legacy and user attribs. All user programs now use the new names. Legacy vertex attribs are given default names.
Diffstat (limited to 'libs/rs/rsScriptC_Lib.cpp')
| -rw-r--r-- | libs/rs/rsScriptC_Lib.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/rs/rsScriptC_Lib.cpp b/libs/rs/rsScriptC_Lib.cpp index eeb9468741e0..6b8ed0dd8e0f 100644 --- a/libs/rs/rsScriptC_Lib.cpp +++ b/libs/rs/rsScriptC_Lib.cpp @@ -687,7 +687,7 @@ static void SC_drawLine(float x1, float y1, float z1, float vtx[] = { x1, y1, z1, x2, y2, z2 }; VertexArray va; - va.setPosition(2, GL_FLOAT, 12, (uint32_t)&vtx); + va.addLegacy(GL_FLOAT, 3, 12, RS_KIND_POSITION, false, (uint32_t)vtx); if (rsc->checkVersion2_0()) { va.setupGL2(rsc, &rsc->mStateVertexArray, &rsc->mShaderCache); } else { @@ -705,7 +705,7 @@ static void SC_drawPoint(float x, float y, float z) float vtx[] = { x, y, z }; VertexArray va; - va.setPosition(1, GL_FLOAT, 12, (uint32_t)&vtx); + va.addLegacy(GL_FLOAT, 3, 12, RS_KIND_POSITION, false, (uint32_t)vtx); if (rsc->checkVersion2_0()) { va.setupGL2(rsc, &rsc->mStateVertexArray, &rsc->mShaderCache); } else { @@ -737,8 +737,8 @@ static void SC_drawQuadTexCoords(float x1, float y1, float z1, const float tex[] = {u1,v1, u2,v2, u3,v3, u4,v4}; VertexArray va; - va.setPosition(3, GL_FLOAT, 12, (uint32_t)&vtx); - va.setTexture(2, GL_FLOAT, 8, (uint32_t)&tex); + va.addLegacy(GL_FLOAT, 3, 12, RS_KIND_POSITION, false, (uint32_t)vtx); + va.addLegacy(GL_FLOAT, 2, 8, RS_KIND_TEXTURE, false, (uint32_t)tex); if (rsc->checkVersion2_0()) { va.setupGL2(rsc, &rsc->mStateVertexArray, &rsc->mShaderCache); } else { |