summaryrefslogtreecommitdiff
path: root/libs/rs/rsScriptC_Lib.cpp
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2010-07-29 17:31:14 -0700
committerJason Sams <rjsams@android.com>2010-07-29 19:10:25 -0700
commitf0690c4f29f3c6fbff2fd5a9cc6d3ff028e1e066 (patch)
tree81bf45c5d18e9c8b69e13e8d5310936dc6946216 /libs/rs/rsScriptC_Lib.cpp
parent8f5d160c92bb03a9156301e0577fa590f1ce0199 (diff)
Cleanup of signed/unsigned
Make all functions overloadable. Change-Id: I443c83afcf9a7acfae394585201f081681f309db Update examples. Change-Id: I100d6fa8dd1af376bcee0b2c42c5aabe9c03bb6e force rebuild of all .rs files to pick up core header changes. Change-Id: I6231a8a024388481ca231507e83b108ebdbc3500
Diffstat (limited to 'libs/rs/rsScriptC_Lib.cpp')
-rw-r--r--libs/rs/rsScriptC_Lib.cpp45
1 files changed, 11 insertions, 34 deletions
diff --git a/libs/rs/rsScriptC_Lib.cpp b/libs/rs/rsScriptC_Lib.cpp
index ccdde008f089..dc30afc46d4e 100644
--- a/libs/rs/rsScriptC_Lib.cpp
+++ b/libs/rs/rsScriptC_Lib.cpp
@@ -184,17 +184,9 @@ static int64_t SC_uptimeMillis()
return nanoseconds_to_milliseconds(systemTime(SYSTEM_TIME_MONOTONIC));
}
-static int64_t SC_startTimeMillis()
+static int64_t SC_uptimeNanos()
{
- GET_TLS();
- return sc->mEnviroment.mStartTimeMillis;
-}
-
-static int64_t SC_elapsedTimeMillis()
-{
- GET_TLS();
- return nanoseconds_to_milliseconds(systemTime(SYSTEM_TIME_MONOTONIC))
- - sc->mEnviroment.mStartTimeMillis;
+ return systemTime(SYSTEM_TIME_MONOTONIC);
}
static float SC_getDt()
@@ -400,7 +392,6 @@ static ScriptCState::SymbolTable_t gSyms[] = {
{ "_Z14rsGetElementAt13rs_allocationjj", (void *)&SC_getElementAtXY },
{ "_Z14rsGetElementAt13rs_allocationjjj", (void *)&SC_getElementAtXYZ },
-
// Debug
{ "_Z7rsDebugPKcf", (void *)&SC_debugF },
{ "_Z7rsDebugPKcDv2_f", (void *)&SC_debugFv2 },
@@ -409,8 +400,6 @@ static ScriptCState::SymbolTable_t gSyms[] = {
{ "_Z7rsDebugPKci", (void *)&SC_debugI32 },
{ "_Z7rsDebugPKcj", (void *)&SC_debugU32 },
{ "_Z7rsDebugPKcPKv", (void *)&SC_debugP },
- //extern void __attribute__((overloadable))rsDebug(const char *, const void *);
-
// RS Math
{ "_Z6rsRandi", (void *)&SC_randi },
@@ -420,27 +409,15 @@ static ScriptCState::SymbolTable_t gSyms[] = {
{ "_Z6rsFracf", (void *)&SC_frac },
// time
- { "_Z8rsSecond", (void *)&SC_second },
- { "_Z8rsMinute", (void *)&SC_minute },
- { "_Z6rsHour", (void *)&SC_hour },
- { "_Z5rsDay", (void *)&SC_day },
- { "_Z7rsMonth", (void *)&SC_month },
- { "_Z6rsYear", (void *)&SC_year },
- { "_Z14rsUptimeMillis", (void*)&SC_uptimeMillis },
- { "_Z17rsStartTimeMillis", (void*)&SC_startTimeMillis },
- { "_Z19rsElapsedTimeMillis", (void*)&SC_elapsedTimeMillis },
- { "_Z7rsGetDt", (void*)&SC_getDt },
-
- { "rsSecond", (void *)&SC_second },
- { "rsMinute", (void *)&SC_minute },
- { "rsHour", (void *)&SC_hour },
- { "rsDay", (void *)&SC_day },
- { "rsMonth", (void *)&SC_month },
- { "rsYear", (void *)&SC_year },
- { "rsUptimeMillis", (void*)&SC_uptimeMillis },
- { "rsStartTimeMillis", (void*)&SC_startTimeMillis },
- { "rsElapsedTimeMillis", (void*)&SC_elapsedTimeMillis },
- { "rsGetDt", (void*)&SC_getDt },
+ { "_Z8rsSecondv", (void *)&SC_second },
+ { "_Z8rsMinutev", (void *)&SC_minute },
+ { "_Z6rsHourv", (void *)&SC_hour },
+ { "_Z5rsDayv", (void *)&SC_day },
+ { "_Z7rsMonthv", (void *)&SC_month },
+ { "_Z6rsYearv", (void *)&SC_year },
+ { "_Z14rsUptimeMillisv", (void*)&SC_uptimeMillis },
+ { "_Z13rsUptimeNanosv", (void*)&SC_uptimeNanos },
+ { "_Z7rsGetDtv", (void*)&SC_getDt },
{ "_Z14rsSendToClienti", (void *)&SC_toClient },
{ "_Z14rsSendToClientiPKvj", (void *)&SC_toClient2 },