commit 1eb0e0d49030ed7fd0df7d3b1ff7b56dcc2fe0be
author Shih-wei Liao <sliao@google.com> Mon Jan 17 01:18:32 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 17 01:18:32 2011 -0800
tree f946f3d369947646a6b02fc449b3fb645ebc2a2d
parent 185b8b01f417488e2fbf6e6c00dfbd3d1d43d98a
parent 93d2111839203dbbbcc4c929f696bfd6694f3c98

Merge "Make ImageProcessing work." into honeycomb

rsAllocation.cpp

diff --git a/rsAllocation.cpp b/rsAllocation.cpp
index 6e4c22e..41c9fe2 100644
--- a/rsAllocation.cpp
+++ b/rsAllocation.cpp
@@ -212,6 +212,7 @@
     GLenum type = mType->getElement()->getComponent().getGLType();
     GLenum format = mType->getElement()->getComponent().getGLFormat();
     GLenum target = (GLenum)getGLTarget();
+    rsAssert(mTextureID);
     glBindTexture(target, mTextureID);
     glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
     GLenum t = GL_TEXTURE_2D;

rsThreadIO.cpp

diff --git a/rsThreadIO.cpp b/rsThreadIO.cpp
index 1c6c5ac..001ac55 100644
--- a/rsThreadIO.cpp
+++ b/rsThreadIO.cpp
@@ -53,6 +53,10 @@
         waitForCommand = false;
         //LOGV("playCoreCommands 3 %i %i", cmdID, cmdSize);
 
+        if (cmdID >= (sizeof(gPlaybackFuncs) / sizeof(void *))) {
+            rsAssert(cmdID < (sizeof(gPlaybackFuncs) / sizeof(void *)));
+            LOGE("playCoreCommands error con %p, cmd %i", con, cmdID);
+        }
         gPlaybackFuncs[cmdID](con, data);
         mToCore.next();
     }

rsg_generator.c

diff --git a/rsg_generator.c b/rsg_generator.c
index 1e468bb..4ac5b7f 100644
--- a/rsg_generator.c
+++ b/rsg_generator.c
@@ -219,7 +219,7 @@
         fprintf(f, "};\n\n");
     }
 
-    fprintf(f, "RsPlaybackFunc gPlaybackFuncs[] = {\n");
+    fprintf(f, "RsPlaybackFunc gPlaybackFuncs[%i] = {\n", apiCount + 1);
     fprintf(f, "    NULL,\n");
     for (ct=0; ct < apiCount; ct++) {
         fprintf(f, "    %s%s,\n", "rsp_", apis[ct].name);
@@ -265,7 +265,7 @@
             printFuncDecls(f, "rsi_", 1);
             printPlaybackFuncs(f, "rsp_");
             fprintf(f, "\n\ntypedef void (*RsPlaybackFunc)(Context *, const void *);\n");
-            fprintf(f, "extern RsPlaybackFunc gPlaybackFuncs[];\n");
+            fprintf(f, "extern RsPlaybackFunc gPlaybackFuncs[%i];\n", apiCount + 1);
 
             fprintf(f, "}\n");
             fprintf(f, "}\n");