summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2010-05-13 12:19:28 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-05-13 12:19:28 -0700
commitf6860f1979b30646e57d41c214b3a60e401abcd1 (patch)
tree8b3496be880697f1a8ff3d4314a2b7426672fde3
parent05a5205b935f6a3fc1a1379a3c4d1bb54a81cf81 (diff)
parent0c677318b54581d488ac6510b6b68e7772d7ab5a (diff)
downloadframeworks_base-f6860f1979b30646e57d41c214b3a60e401abcd1.zip
frameworks_base-f6860f1979b30646e57d41c214b3a60e401abcd1.tar.gz
frameworks_base-f6860f1979b30646e57d41c214b3a60e401abcd1.tar.bz2
Merge "Add missing bindProgramRaster to scriptC_lib."
-rw-r--r--libs/rs/rsScriptC_Lib.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/libs/rs/rsScriptC_Lib.cpp b/libs/rs/rsScriptC_Lib.cpp
index d94a62c..5cf0fdb 100644
--- a/libs/rs/rsScriptC_Lib.cpp
+++ b/libs/rs/rsScriptC_Lib.cpp
@@ -649,21 +649,24 @@ static void SC_bindProgramFragmentStore(RsProgramFragmentStore pfs)
{
GET_TLS();
rsi_ContextBindProgramFragmentStore(rsc, pfs);
-
}
static void SC_bindProgramFragment(RsProgramFragment pf)
{
GET_TLS();
rsi_ContextBindProgramFragment(rsc, pf);
-
}
static void SC_bindProgramVertex(RsProgramVertex pv)
{
GET_TLS();
rsi_ContextBindProgramVertex(rsc, pv);
+}
+static void SC_bindProgramRaster(RsProgramRaster pv)
+{
+ GET_TLS();
+ rsi_ContextBindProgramRaster(rsc, pv);
}
//////////////////////////////////////////////////////////////////////////////
@@ -1316,6 +1319,7 @@ ScriptCState::SymbolTable_t ScriptCState::gSyms[] = {
{ "bindProgramFragmentStore", (void *)&SC_bindProgramFragmentStore },
{ "bindProgramStore", (void *)&SC_bindProgramFragmentStore },
{ "bindProgramVertex", (void *)&SC_bindProgramVertex },
+ { "bindProgramRaster", (void *)&SC_bindProgramRaster },
{ "bindSampler", (void *)&SC_bindSampler },
{ "bindTexture", (void *)&SC_bindTexture },