diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2011-05-12 10:15:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-12 10:15:17 -0700 |
| commit | 415c842aa6dd3cc797ed2ef1ae42351f594a6c74 (patch) | |
| tree | 938ce71744d87aa03730d7fce22ca0243a369fa9 /libs/rs/rsScriptC_LibGL.cpp | |
| parent | e4ba346f0f1bb153ec1f9da5c0a4fc96c301efda (diff) | |
| parent | 407cae950325682a56fe5373dd218a666da901ef (diff) | |
| download | frameworks_base-415c842aa6dd3cc797ed2ef1ae42351f594a6c74.zip frameworks_base-415c842aa6dd3cc797ed2ef1ae42351f594a6c74.tar.gz frameworks_base-415c842aa6dd3cc797ed2ef1ae42351f594a6c74.tar.bz2 | |
Merge "rsLib cleanup"
Diffstat (limited to 'libs/rs/rsScriptC_LibGL.cpp')
| -rw-r--r-- | libs/rs/rsScriptC_LibGL.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/rs/rsScriptC_LibGL.cpp b/libs/rs/rsScriptC_LibGL.cpp index ecda485..3259cb4 100644 --- a/libs/rs/rsScriptC_LibGL.cpp +++ b/libs/rs/rsScriptC_LibGL.cpp @@ -156,7 +156,7 @@ void rsrDrawQuadTexCoords(Context *rsc, Script *sc, attribs[1].set(GL_FLOAT, 2, 8, false, (uint32_t)tex, "ATTRIB_texture0"); RsdVertexArray va(attribs, 2); - va.setupGL2(rsc); + va.setup(rsc); glDrawArrays(GL_TRIANGLE_FAN, 0, 4); } @@ -250,7 +250,7 @@ void rsrFinish(Context *rsc, Script *sc) { void rsrClearColor(Context *rsc, Script *sc, float r, float g, float b, float a) { - rsc->mFBOCache.setupGL2(rsc); + rsc->mFBOCache.setup(rsc); rsc->setupProgramStore(); glClearColor(r, g, b, a); @@ -258,7 +258,7 @@ void rsrClearColor(Context *rsc, Script *sc, float r, float g, float b, float a) } void rsrClearDepth(Context *rsc, Script *sc, float v) { - rsc->mFBOCache.setupGL2(rsc); + rsc->mFBOCache.setup(rsc); rsc->setupProgramStore(); glClearDepthf(v); |