From 7e8aae7f76f221905fba7ccbcb3442c6f96dfad2 Mon Sep 17 00:00:00 2001 From: Jason Sams Date: Thu, 26 May 2011 16:33:01 -0700 Subject: Start splitting allocation into hal and core. Change-Id: Ic506abb0469238cb0471eb1401cfcb7b2fbbe4bb --- libs/rs/rsProgramFragment.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libs/rs/rsProgramFragment.cpp') 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); -- cgit v1.2.3-59-g8ed1b