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

am 6d884d6c: Merge "Fix RS samples to prepare for 64-bit compilation."

Browse Source 
* commit '6d884d6cb304e14e380ba501abe868cfaea97426':
  Fix RS samples to prepare for 64-bit compilation.
This commit is contained in:
Stephen Hines
2014-08-22 23:58:35 +00:00
committed by Android Git Automerger
parent 67f00d4487 6d884d6cb3
commit 9cad766918
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/RenderScript/HelloCompute/src/com/example/android/rs/hellocompute/HelloCompute.java
View File

@@ -62,7 +62,7 @@ public class HelloCompute extends Activity {
Allocation.MipmapControl.MIPMAP_NONE, Allocation.MipmapControl.MIPMAP_NONE,
Allocation.USAGE_SCRIPT); Allocation.USAGE_SCRIPT);
mScript = new ScriptC_mono(mRS, getResources(), R.raw.mono); mScript = new ScriptC_mono(mRS);
mScript.forEach_root(mInAllocation, mOutAllocation); mScript.forEach_root(mInAllocation, mOutAllocation);
mOutAllocation.copyTo(mBitmapOut); mOutAllocation.copyTo(mBitmapOut);

2
samples/RenderScript/Levels/src/com/android/rs/levels/LevelsRSActivity.java
View File

@@ -176,7 +176,7 @@ public class LevelsRSActivity extends Activity
Allocation.USAGE_IO_OUTPUT); Allocation.USAGE_IO_OUTPUT);
mDisplayView.setSurfaceTextureListener(this); mDisplayView.setSurfaceTextureListener(this);
mScript = new ScriptC_levels(mRS, getResources(), R.raw.levels); mScript = new ScriptC_levels(mRS);
mScript.set_gamma(mGamma); mScript.set_gamma(mGamma);
setSaturation(); setSaturation();