summaryrefslogtreecommitdiff
path: root/libs/rs/rsProgramFragment.cpp
diff options
context:
space:
mode:
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
commit7e8aae7f76f221905fba7ccbcb3442c6f96dfad2 (patch)
tree6b1437303a2f5a54f16e99abc5a04500d6a98265 /libs/rs/rsProgramFragment.cpp
parent3a9e712aca65ac49e7155e98e5d6b815da76f94b (diff)
Start splitting allocation into hal and core.
Change-Id: Ic506abb0469238cb0471eb1401cfcb7b2fbbe4bb
Diffstat (limited to 'libs/rs/rsProgramFragment.cpp')
-rw-r--r--libs/rs/rsProgramFragment.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/rs/rsProgramFragment.cpp b/libs/rs/rsProgramFragment.cpp
index e40fc7b5de83..0823d8220a10 100644
--- a/libs/rs/rsProgramFragment.cpp
+++ b/libs/rs/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);