diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2010-10-28 10:32:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-28 10:32:12 -0700 |
| commit | de33dd7c0ded0ae9b71de9f82081c2bede7083c0 (patch) | |
| tree | a335ad7317b5dd74dfd6dcca0481604d410bcc89 /libs/rs/rsContext.cpp | |
| parent | 07173fd2c1de3aa091494d93aa6f515818bddb9a (diff) | |
| parent | 581cc64028e8b8f66cec8105bf530b16d5fb34eb (diff) | |
| download | frameworks_base-de33dd7c0ded0ae9b71de9f82081c2bede7083c0.zip frameworks_base-de33dd7c0ded0ae9b71de9f82081c2bede7083c0.tar.gz frameworks_base-de33dd7c0ded0ae9b71de9f82081c2bede7083c0.tar.bz2 | |
Merge "Adding nvidia extension for limited npot support. Updating a3d loading to be async."
Diffstat (limited to 'libs/rs/rsContext.cpp')
| -rw-r--r-- | libs/rs/rsContext.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp index 944cd86..3f04585 100644 --- a/libs/rs/rsContext.cpp +++ b/libs/rs/rsContext.cpp @@ -222,6 +222,7 @@ void Context::initGLThread() glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_VECTORS, &mGL.mMaxFragmentUniformVectors); mGL.OES_texture_npot = NULL != strstr((const char *)mGL.mExtensions, "GL_OES_texture_npot"); + mGL.GL_NV_texture_npot_2D_mipmap = NULL != strstr((const char *)mGL.mExtensions, "GL_NV_texture_npot_2D_mipmap"); mGL.EXT_texture_max_aniso = 1.0f; bool hasAniso = NULL != strstr((const char *)mGL.mExtensions, "GL_EXT_texture_filter_anisotropic"); if(hasAniso) { @@ -970,12 +971,6 @@ void rsi_AssignName(Context *rsc, void * obj, const char *name, uint32_t len) rsc->assignName(ob, name, len); } -void rsi_GetName(Context *rsc, void * obj, const char **name) -{ - ObjectBase *ob = static_cast<ObjectBase *>(obj); - (*name) = ob->getName(); -} - void rsi_ObjDestroy(Context *rsc, void *optr) { ObjectBase *ob = static_cast<ObjectBase *>(optr); @@ -1062,3 +1057,10 @@ void rsContextDeinitToClient(RsContext vrsc) rsc->deinitToClient(); } +// Only to be called at a3d load time, before object is visible to user +// not thread safe +void rsaGetName(RsContext con, void * obj, const char **name) +{ + ObjectBase *ob = static_cast<ObjectBase *>(obj); + (*name) = ob->getName(); +} |