summaryrefslogtreecommitdiff
path: root/libs/rs/rsContext.cpp
diff options
context:
space:
mode:
author Jason Sams <rjsams@android.com> 2011-04-06 11:40:33 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-04-06 11:40:33 -0700
commit46ded12dd1fdcafa42b48fd64ef02be1b323019b (patch)
treea6e8ce7a7e5f4dd1cd84471ce3fac83496edd78c /libs/rs/rsContext.cpp
parentd57a93b27d43ac46960be6276a208da0b686bcf4 (diff)
parent331bf9b14b1c5c1e88f5c4092b6e24fae887fb3b (diff)
Merge "Seperate ProgramRaster. Cleanup ProgramRaster and ProgramStore creation."
Diffstat (limited to 'libs/rs/rsContext.cpp')
-rw-r--r--libs/rs/rsContext.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp
index d727ba1daaaa..c9a706090d26 100644
--- a/libs/rs/rsContext.cpp
+++ b/libs/rs/rsContext.cpp
@@ -405,16 +405,16 @@ bool Context::setupCheck() {
return false;
}
- mFragmentStore->setupGL2(this, &mStateFragmentStore);
+ mFragmentStore->setup(this, &mStateFragmentStore);
mFragment->setupGL2(this, &mStateFragment, &mShaderCache);
- mRaster->setupGL2(this, &mStateRaster);
+ mRaster->setup(this, &mStateRaster);
mVertex->setupGL2(this, &mStateVertex, &mShaderCache);
mFBOCache.setupGL2(this);
return true;
}
void Context::setupProgramStore() {
- mFragmentStore->setupGL2(this, &mStateFragmentStore);
+ mFragmentStore->setup(this, &mStateFragmentStore);
}
static bool getProp(const char *str) {