diff options
author | Jason Sams <rjsams@android.com> | 2011-05-26 16:33:01 -0700 |
---|---|---|
committer | Jason Sams <rjsams@android.com> | 2011-05-26 16:33:01 -0700 |
commit | eb4fe18dd88634330f9566cbb9e785d8c7ec5813 (patch) | |
tree | 4e9d96b4eb0d0e2678eefd67d564cc38e0ec7885 /rsProgramFragment.cpp | |
parent | 789ca83c794cb7196c9bac97d39eaf1f7947af2a (diff) | |
download | rs-eb4fe18dd88634330f9566cbb9e785d8c7ec5813.tar.gz |
Start splitting allocation into hal and core.
Change-Id: Ic506abb0469238cb0471eb1401cfcb7b2fbbe4bb
Diffstat (limited to 'rsProgramFragment.cpp')
-rw-r--r-- | rsProgramFragment.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rsProgramFragment.cpp b/rsProgramFragment.cpp index e40fc7b5..0823d822 100644 --- a/rsProgramFragment.cpp +++ b/rsProgramFragment.cpp @@ -67,7 +67,6 @@ void ProgramFragment::setup(Context *rsc, ProgramFragmentState *state) { rsc->setError(RS_ERROR_BAD_SHADER, "No texture bound"); continue; } - mHal.state.textures[ct]->uploadCheck(rsc); } rsc->mHal.funcs.fragment.setActive(rsc, this); @@ -109,7 +108,8 @@ void ProgramFragmentState::init(Context *rsc) { tmp[0] = RS_PROGRAM_PARAM_CONSTANT; tmp[1] = (uint32_t)inputType; - Allocation *constAlloc = new Allocation(rsc, inputType, RS_ALLOCATION_USAGE_SCRIPT | RS_ALLOCATION_USAGE_GRAPHICS_CONSTANTS); + Allocation *constAlloc = Allocation::createAllocation(rsc, inputType, + RS_ALLOCATION_USAGE_SCRIPT | RS_ALLOCATION_USAGE_GRAPHICS_CONSTANTS); ProgramFragment *pf = new ProgramFragment(rsc, shaderString.string(), shaderString.length(), tmp, 2); pf->bindAllocation(rsc, constAlloc, 0); |