LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix app bug, where some memory could remain uninitialized due to early exit."

Browse Source
This commit is contained in:
Stephen Hines
2012-02-13 13:54:31 -08:00
committed by Android (Google) Code Review
parent de48b21c2d 432b5a25e6
commit ffb9333cb4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/RenderScript/Balls/src/com/example/android/rs/balls/ball_physics.rs
View File

@@ -58,7 +58,7 @@ void root(const Ball_t *ballIn, Ball_t *ballOut, const BallControl_t *ctl, uint3
//ballOut->color.rgb = 1.f; //ballOut->color.rgb = 1.f;
//ballOut->arcID = -1; //ballOut->arcID = -1;
//ballOut->arcStr = 0; //ballOut->arcStr = 0;
return; continue;
} }
// Collision // Collision
float2 axis = normalize(vec); float2 axis = normalize(vec);

4
samples/RenderScript/Balls/src/com/example/android/rs/balls/balls.rs
View File

@@ -58,11 +58,11 @@ int root() {
if (frame & 1) { if (frame & 1) {
bc.ain = rsGetAllocation(balls2); bc.ain = rsGetAllocation(balls2);
bc.aout = rsGetAllocation(balls1); bc.aout = rsGetAllocation(balls1);
bout = balls2; bout = balls1;
} else { } else {
bc.ain = rsGetAllocation(balls1); bc.ain = rsGetAllocation(balls1);
bc.aout = rsGetAllocation(balls2); bc.aout = rsGetAllocation(balls2);
bout = balls1; bout = balls2;
} }
bc.dimX = rsAllocationGetDimX(bc.ain); bc.dimX = rsAllocationGetDimX(bc.ain);