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

Merge "Add some error checking." into honeycomb

Browse Source
This commit is contained in:
Jason Sams
2011-01-16 17:46:16 -08:00
committed by Android (Google) Code Review
parent 502045849f 300406abd4
commit 7f13a850dd
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libs/rs/rsAllocation.cpp
View File

@@ -212,6 +212,7 @@ void Allocation::update2DTexture(const void *ptr, uint32_t xoff, uint32_t yoff,
GLenum type = mType->getElement()->getComponent().getGLType(); GLenum type = mType->getElement()->getComponent().getGLType();
GLenum format = mType->getElement()->getComponent().getGLFormat(); GLenum format = mType->getElement()->getComponent().getGLFormat();
GLenum target = (GLenum)getGLTarget(); GLenum target = (GLenum)getGLTarget();
rsAssert(mTextureID);
glBindTexture(target, mTextureID); glBindTexture(target, mTextureID);
glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
GLenum t = GL_TEXTURE_2D; GLenum t = GL_TEXTURE_2D;

4
libs/rs/rsThreadIO.cpp
View File

@@ -53,6 +53,10 @@ bool ThreadIO::playCoreCommands(Context *con, bool waitForCommand) {
waitForCommand = false; waitForCommand = false;
//LOGV("playCoreCommands 3 %i %i", cmdID, cmdSize); //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); gPlaybackFuncs[cmdID](con, data);
mToCore.next(); mToCore.next();
} }

4
libs/rs/rsg_generator.c
View File

@@ -219,7 +219,7 @@ void printPlaybackCpp(FILE *f) {
fprintf(f, "};\n\n"); fprintf(f, "};\n\n");
} }
fprintf(f, "RsPlaybackFunc gPlaybackFuncs[] = {\n"); fprintf(f, "RsPlaybackFunc gPlaybackFuncs[%i] = {\n", apiCount + 1);
fprintf(f, " NULL,\n"); fprintf(f, " NULL,\n");
for (ct=0; ct < apiCount; ct++) { for (ct=0; ct < apiCount; ct++) {
fprintf(f, " %s%s,\n", "rsp_", apis[ct].name); fprintf(f, " %s%s,\n", "rsp_", apis[ct].name);
@@ -265,7 +265,7 @@ int main(int argc, char **argv) {
printFuncDecls(f, "rsi_", 1); printFuncDecls(f, "rsi_", 1);
printPlaybackFuncs(f, "rsp_"); printPlaybackFuncs(f, "rsp_");
fprintf(f, "\n\ntypedef void (*RsPlaybackFunc)(Context *, const void *);\n"); 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");
fprintf(f, "}\n"); fprintf(f, "}\n");