Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af07b591 authored by Joe Onorato's avatar Joe Onorato Committed by Android Git Automerger
Browse files

am b3699b14: am 836e1666: Merge "add drawSpriteScreenspaceCropped to renderscript" into eclair 

Merge commit 'b3699b14'

* commit 'b3699b14':
  add drawSpriteScreenspaceCropped to renderscript
parents 8be34642 b3699b14

libs/rs/Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -110,9 +110,5 @@ LOCAL_MODULE_TAGS := optional 


include $(BUILD_SHARED_LIBRARY)



# Include the subdirectories ====================

include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk,\

            java \

    	))



endif #simulator

libs/rs/rsScriptC_Lib.cpp

+13 −0
Original line number Diff line number Diff line
@@ -778,6 +778,17 @@ static void SC_drawSpriteScreenspace(float x, float y, float z, float w, float h 
    rsc->setVertex((ProgramVertex *)tmp.get());

}



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)

{

    GET_TLS();
@@ -1289,6 +1300,8 @@ ScriptCState::SymbolTable_t ScriptCState::gSyms[] = { 
        "void", "(float x, float y, float z, float w, float h)" },

    { "drawSpriteScreenspace", (void *)&SC_drawSpriteScreenspace,

        "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,

        "void", "(float x1, float y1, float z1, float x2, float y2, float z2)" },

    { "drawPoint", (void *)&SC_drawPoint,