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

am 7c12540f: Merge change Ibd2197fb into eclair

Browse Source 
Merge commit '7c12540f09659dec0a4222831ed7e5ab8d7b0cdf' into eclair-mr2

* commit '7c12540f09659dec0a4222831ed7e5ab8d7b0cdf':
  Add script to script call support.  Add exception to catch out of bound index data when added to TriangleMeshBuilder.
This commit is contained in:
Jason Sams
2009-10-07 18:24:09 -07:00
committed by Android Git Automerger
parent 83b600803c 7c12540f09
commit 48289b2e89
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
graphics/java/android/renderscript/SimpleMesh.java
View File

@@ -290,6 +290,11 @@ public class SimpleMesh extends BaseObj {
} }
public void addTriangle(int idx1, int idx2, int idx3) { public void addTriangle(int idx1, int idx2, int idx3) {
if((idx1 >= mVtxCount) || (idx1 < 0) ||
(idx2 >= mVtxCount) || (idx2 < 0) ||
(idx3 >= mVtxCount) || (idx3 < 0)) {
throw new IllegalStateException("Index provided greater than vertex count.");
}
if ((mIndexCount + 3) >= mIndexData.length) { if ((mIndexCount + 3) >= mIndexData.length) {
short t[] = new short[mIndexData.length * 2]; short t[] = new short[mIndexData.length * 2];
System.arraycopy(mIndexData, 0, t, 0, mIndexData.length); System.arraycopy(mIndexData, 0, t, 0, mIndexData.length);

2
libs/rs/rsContext.h
View File

@@ -99,6 +99,7 @@ public:
uint32_t getMessageToClient(void *data, size_t *receiveLen, size_t bufferLen, bool wait); uint32_t getMessageToClient(void *data, size_t *receiveLen, size_t bufferLen, bool wait);
bool sendMessageToClient(void *data, uint32_t cmdID, size_t len, bool waitForSpace); bool sendMessageToClient(void *data, uint32_t cmdID, size_t len, bool waitForSpace);
bool runScript(Script *s, uint32_t launchID);
void initToClient(); void initToClient();
void deinitToClient(); void deinitToClient();
@@ -212,7 +213,6 @@ private:
void initEGL(); void initEGL();
bool runScript(Script *s, uint32_t launchID);
bool runRootScript(); bool runRootScript();
static void * threadProc(void *); static void * threadProc(void *);

10
libs/rs/rsScriptC_Lib.cpp
View File

@@ -1008,6 +1008,13 @@ static uint32_t SC_toClient(void *data, int cmdID, int len, int waitForSpace)
return rsc->sendMessageToClient(data, cmdID, len, waitForSpace != 0); return rsc->sendMessageToClient(data, cmdID, len, waitForSpace != 0);
} }
static void SC_scriptCall(int scriptID)
{
GET_TLS();
rsc->runScript((Script *)scriptID, 0);
}
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// Class implementation // Class implementation
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
@@ -1289,6 +1296,9 @@ ScriptCState::SymbolTable_t ScriptCState::gSyms[] = {
{ "debugHexI32", (void *)&SC_debugHexI32, { "debugHexI32", (void *)&SC_debugHexI32,
"void", "(void *, int)" }, "void", "(void *, int)" },
{ "scriptCall", (void *)&SC_scriptCall,
"void", "(int)" },
{ NULL, NULL, NULL, NULL } { NULL, NULL, NULL, NULL }
}; };