Merge "Revert "Revert "Revert "Make Gallery2 use platform RenderScript""""

[android-x86/packages-apps-Gallery2.git] / src / com / android / gallery3d / filtershow / filters / ImageFilterRS.java

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
index c623c63..e94e2a6 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
@@ -22,7 +22,7 @@ import android.support.v8.renderscript.*;
 import android.util.Log;
 import android.content.res.Resources;
 import com.android.gallery3d.R;
-import com.android.gallery3d.filtershow.presets.PipelineInterface;
+import com.android.gallery3d.filtershow.pipeline.PipelineInterface;
 
 public abstract class ImageFilterRS extends ImageFilter {
     private static final String LOGTAG = "ImageFilterRS";
@@ -80,11 +80,7 @@ public abstract class ImageFilterRS extends ImageFilter {
         mLastTimeCalled = startOverAll;
         long startFilter = 0;
         long endFilter = 0;
-        if (!mResourcesLoaded || getReInitNeeded()) {
-            if (getReInitNeeded()) {
-                freeResources();
-                setReInitNeeded(false);
-            }
+        if (!mResourcesLoaded) {
             PipelineInterface pipeline = getEnvironment().getPipeline();
             createFilter(pipeline.getResources(), getEnvironment().getScaleFactor(),
                     getEnvironment().getQuality(), in);
@@ -129,11 +125,10 @@ public abstract class ImageFilterRS extends ImageFilter {
                 sizeChanged = true;
             }
             if (pipeline.prepareRenderscriptAllocations(bitmap)
-                    || !isResourcesLoaded() || sizeChanged || getReInitNeeded()) {
+                    || !isResourcesLoaded() || sizeChanged) {
                 freeResources();
                 createFilter(rsc, scaleFactor, quality);
                 setResourcesLoaded(true);
-                setReInitNeeded(false);
                 mLastInputWidth = getInPixelsAllocation().getType().getX();
                 mLastInputHeight = getInPixelsAllocation().getType().getY();
             }
@@ -164,8 +159,7 @@ public abstract class ImageFilterRS extends ImageFilter {
 
     private static Allocation convertRGBAtoA(RenderScript RS, Bitmap bitmap) {
         if (RS != mRScache || mGreyConvert == null) {
-            mGreyConvert = new ScriptC_grey(RS, RS.getApplicationContext().getResources(),
-                                            R.raw.grey);
+            mGreyConvert = new ScriptC_grey(RS);
             mRScache = RS;
         }
 
@@ -189,7 +183,6 @@ public abstract class ImageFilterRS extends ImageFilter {
     public Allocation loadScaledResourceAlpha(int resource, int inSampleSize) {
         Resources res = getEnvironment().getPipeline().getResources();
         final BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inPreferredConfig = Bitmap.Config.ALPHA_8;
         options.inSampleSize      = inSampleSize;
         Bitmap bitmap = BitmapFactory.decodeResource(
                 res,
@@ -202,7 +195,6 @@ public abstract class ImageFilterRS extends ImageFilter {
     public Allocation loadScaledResourceAlpha(int resource, int w, int h, int inSampleSize) {
         Resources res = getEnvironment().getPipeline().getResources();
         final BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inPreferredConfig = Bitmap.Config.ALPHA_8;
         options.inSampleSize      = inSampleSize;
         Bitmap bitmap = BitmapFactory.decodeResource(
                 res,