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 | 10f2a3c5b3026e3c7fcd40f70cb13a7f89172300 (patch) | |
| tree | de9d1801da7d8d70471af54130e4b7f79f14d2eb /libs/rs/rsScriptC_LibGL.cpp | |
| parent | b64ef770db501ea4665a32bfbf6617e2005fad5c (diff) | |
| parent | fdccec9c21fafe1bc70b6437115d42e75643ba75 (diff) | |
Merge "Now utilizing ability to bind constants. Fixing small copy/paste typo." into graphics-dev
Diffstat (limited to 'libs/rs/rsScriptC_LibGL.cpp')
| -rw-r--r-- | libs/rs/rsScriptC_LibGL.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/rs/rsScriptC_LibGL.cpp b/libs/rs/rsScriptC_LibGL.cpp index dece3636b1c8..97469d370553 100644 --- a/libs/rs/rsScriptC_LibGL.cpp +++ b/libs/rs/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) { |