Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 25818 into eclair

Browse Source 
* changes:
  Clean up some debugging and add 2 math lib routines.
This commit is contained in:
Android (Google) Code Review
2009-09-18 17:25:21 -04:00
parent 6286f311c3 d342fd7526
commit a411bf01fc
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
graphics/jni/android_renderscript_RenderScript.cpp
View File

@@ -255,28 +255,24 @@ static void * SF_LoadFloat(JNIEnv *_env, jobject _obj, jfieldID _field, void *bu
static void * SF_SaveInt(JNIEnv *_env, jobject _obj, jfieldID _field, void *buffer) static void * SF_SaveInt(JNIEnv *_env, jobject _obj, jfieldID _field, void *buffer)
{ {
LOGE("Save Int");
_env->SetIntField(_obj, _field, ((int32_t *)buffer)[0]); _env->SetIntField(_obj, _field, ((int32_t *)buffer)[0]);
return ((uint8_t *)buffer) + 4; return ((uint8_t *)buffer) + 4;
} }
static void * SF_SaveShort(JNIEnv *_env, jobject _obj, jfieldID _field, void *buffer) static void * SF_SaveShort(JNIEnv *_env, jobject _obj, jfieldID _field, void *buffer)
{ {
LOGE("Save Short");
_env->SetShortField(_obj, _field, ((int16_t *)buffer)[0]); _env->SetShortField(_obj, _field, ((int16_t *)buffer)[0]);
return ((uint8_t *)buffer) + 2; return ((uint8_t *)buffer) + 2;
} }
static void * SF_SaveByte(JNIEnv *_env, jobject _obj, jfieldID _field, void *buffer) static void * SF_SaveByte(JNIEnv *_env, jobject _obj, jfieldID _field, void *buffer)
{ {
LOGE("Save Byte");
_env->SetByteField(_obj, _field, ((int8_t *)buffer)[0]); _env->SetByteField(_obj, _field, ((int8_t *)buffer)[0]);
return ((uint8_t *)buffer) + 1; return ((uint8_t *)buffer) + 1;
} }
static void * SF_SaveFloat(JNIEnv *_env, jobject _obj, jfieldID _field, void *buffer) static void * SF_SaveFloat(JNIEnv *_env, jobject _obj, jfieldID _field, void *buffer)
{ {
LOGE("Save Float");
_env->SetFloatField(_obj, _field, ((float *)buffer)[0]); _env->SetFloatField(_obj, _field, ((float *)buffer)[0]);
return ((uint8_t *)buffer) + 4; return ((uint8_t *)buffer) + 4;
} }
@@ -601,11 +597,8 @@ nAllocationSubReadFromObject(JNIEnv *_env, jobject _this, jint alloc, jobject _t
void * buf = bufAlloc; void * buf = bufAlloc;
rsAllocationRead(con, (RsAllocation)alloc, bufAlloc); rsAllocationRead(con, (RsAllocation)alloc, bufAlloc);
LOGE("size %i, ", tc->size);
for (int ct=0; ct < tc->fieldCount; ct++) { for (int ct=0; ct < tc->fieldCount; ct++) {
const TypeFieldCache *tfc = &tc->fields[ct]; const TypeFieldCache *tfc = &tc->fields[ct];
LOGE("ct=%i, buf=%p", ct, buf);
buf = tfc->readPtr(_env, _o, tfc->field, buf); buf = tfc->readPtr(_env, _o, tfc->field, buf);
} }
free(bufAlloc); free(bufAlloc);

14
libs/rs/rsScriptC_Lib.cpp
View File

@@ -321,6 +321,16 @@ static int SC_sqr(int v)
return v * v; return v * v;
} }
static float SC_fracf(float v)
{
return v - floorf(v);
}
static float SC_roundf(float v)
{
return floorf(v + 0.4999999999);
}
static float SC_distf2(float x1, float y1, float x2, float y2) static float SC_distf2(float x1, float y1, float x2, float y2)
{ {
float x = x2 - x1; float x = x2 - x1;
@@ -1014,8 +1024,12 @@ ScriptCState::SymbolTable_t ScriptCState::gSyms[] = {
"float", "(float, float)" }, "float", "(float, float)" },
{ "floorf", (void *)&floorf, { "floorf", (void *)&floorf,
"float", "(float)" }, "float", "(float)" },
{ "fracf", (void *)&SC_fracf,
"float", "(float)" },
{ "ceilf", (void *)&ceilf, { "ceilf", (void *)&ceilf,
"float", "(float)" }, "float", "(float)" },
{ "roundf", (void *)&SC_roundf,
"float", "(float)" },
{ "expf", (void *)&expf, { "expf", (void *)&expf,
"float", "(float)" }, "float", "(float)" },
{ "logf", (void *)&logf, { "logf", (void *)&logf,