diff options
author | Alex Sakhartchouk <alexst@google.com> | 2012-01-10 14:40:48 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-10 14:40:48 -0800 |
commit | ef7a3b314a858355356d7a1edbc91dfbbc117945 (patch) | |
tree | f703a4cee4d1b227700c99ee6432b633fe46ed25 /rsScriptC_LibGL.cpp | |
parent | da042e76b482e026592c42e5ee57b86413b9c57a (diff) | |
parent | 8e6bde735d3c0024c36beff668e1588803657357 (diff) | |
download | rs-ef7a3b314a858355356d7a1edbc91dfbbc117945.tar.gz |
Merge "Now utilizing ability to bind constants. Fixing small copy/paste typo." into graphics-dev
Diffstat (limited to 'rsScriptC_LibGL.cpp')
-rw-r--r-- | rsScriptC_LibGL.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rsScriptC_LibGL.cpp b/rsScriptC_LibGL.cpp index dece3636..97469d37 100644 --- a/rsScriptC_LibGL.cpp +++ b/rsScriptC_LibGL.cpp @@ -56,10 +56,10 @@ void rsrBindConstant(Context *rsc, Script *sc, ProgramFragment *pf, uint32_t slo pf->bindAllocation(rsc, a, slot); } -void rsrBindConstant(Context *rsc, Script *sc, ProgramVertex *pf, uint32_t slot, Allocation *a) { +void rsrBindConstant(Context *rsc, Script *sc, ProgramVertex *pv, uint32_t slot, Allocation *a) { CHECK_OBJ_OR_NULL(a); - CHECK_OBJ(pf); - pf->bindAllocation(rsc, a, slot); + CHECK_OBJ(pv); + pv->bindAllocation(rsc, a, slot); } void rsrBindSampler(Context *rsc, Script *sc, ProgramFragment *pf, uint32_t slot, Sampler *s) { |