drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "add drawSpriteScreenspaceCropped to renderscript" into eclair

Browse Source
This commit is contained in:
Joe Onorato
2010-01-14 15:53:45 -08:00
committed by Android (Google) Code Review
parent 0409b1baaa 6656c1be2b
commit 836e16666e
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/rs/Android.mk
View File

@ -107,9 +107,5 @@ LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
# Include the subdirectories ====================
include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk,\
java \
))
endif #simulator endif #simulator

13
libs/rs/rsScriptC_Lib.cpp
View File

@ -776,6 +776,17 @@ static void SC_drawSpriteScreenspace(float x, float y, float z, float w, float h
glDrawTexfOES(x, y, z, w, h); glDrawTexfOES(x, y, z, w, h);
} }
static void SC_drawSpriteScreenspaceCropped(float x, float y, float z, float w, float h,
float cx0, float cy0, float cx1, float cy1)
{
GET_TLS();
rsc->setupCheck();
GLint crop[4] = {cx0, cy0, cx1, cy1};
glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_CROP_RECT_OES, crop);
glDrawTexfOES(x, y, z, w, h);
}
static void SC_drawSprite(float x, float y, float z, float w, float h) static void SC_drawSprite(float x, float y, float z, float w, float h)
{ {
GET_TLS(); GET_TLS();
@ -1271,6 +1282,8 @@ ScriptCState::SymbolTable_t ScriptCState::gSyms[] = {
"void", "(float x, float y, float z, float w, float h)" }, "void", "(float x, float y, float z, float w, float h)" },
{ "drawSpriteScreenspace", (void *)&SC_drawSpriteScreenspace, { "drawSpriteScreenspace", (void *)&SC_drawSpriteScreenspace,
"void", "(float x, float y, float z, float w, float h)" }, "void", "(float x, float y, float z, float w, float h)" },
{ "drawSpriteScreenspaceCropped", (void *)&SC_drawSpriteScreenspaceCropped,
"void", "(float x, float y, float z, float w, float h, float cx0, float cy0, float cx1, float cy1)" },
{ "drawLine", (void *)&SC_drawLine, { "drawLine", (void *)&SC_drawLine,
"void", "(float x1, float y1, float z1, float x2, float y2, float z2)" }, "void", "(float x1, float y1, float z1, float x2, float y2, float z2)" },
{ "drawPoint", (void *)&SC_drawPoint, { "drawPoint", (void *)&SC_drawPoint,