Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1ccbf52 authored by Jason Sams's avatar Jason Sams
Browse files

Add greyscale intrinsic test. 

Change-Id: I24c9b8769ab7fe2fed9ef17f7ff1063c60977c41
parent 8fd5853c

tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ColorMatrix.java

+8 −2
Original line number Diff line number Diff line
@@ -33,9 +33,11 @@ public class ColorMatrix extends TestBase { 
    private ScriptC_colormatrix mScript;

    private ScriptIntrinsicColorMatrix mIntrinsic;

    private boolean mUseIntrinsic;

    private boolean mUseGrey;



    public ColorMatrix(boolean useIntrinsic) {

    public ColorMatrix(boolean useIntrinsic, boolean useGrey) {

        mUseIntrinsic = useIntrinsic;

        mUseGrey = useGrey;

    }



    public void createTest(android.content.res.Resources res) {
@@ -46,7 +48,11 @@ public class ColorMatrix extends TestBase { 


        if (mUseIntrinsic) {

            mIntrinsic = ScriptIntrinsicColorMatrix.create(mRS, Element.U8_4(mRS));

            if (mUseGrey) {

                mIntrinsic.setGreyscale();

            } else {

                mIntrinsic.setColorMatrix(m);

            }

        } else {

            mScript = new ScriptC_colormatrix(mRS, res, R.raw.colormatrix);

            mScript.invoke_setMatrix(m);

tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java

+8 −4
Original line number Diff line number Diff line
@@ -180,12 +180,15 @@ public class ImageProcessingActivity extends Activity 
            mTest = new Convolve3x3(true);

            break;

        case 19:

            mTest = new ColorMatrix(false);

            mTest = new ColorMatrix(false, false);

            break;

        case 20:

            mTest = new ColorMatrix(true);

            mTest = new ColorMatrix(true, false);

            break;

        case 21:

            mTest = new ColorMatrix(true, true);

            break;

        case 22:

            mTest = new Copy();

            break;

        }
@@ -200,7 +203,7 @@ public class ImageProcessingActivity extends Activity 
    }



    void setupTests() {

        mTestNames = new String[22];

        mTestNames = new String[23];

        mTestNames[0] = "Levels Vec3 Relaxed";

        mTestNames[1] = "Levels Vec4 Relaxed";

        mTestNames[2] = "Levels Vec3 Full";
@@ -222,7 +225,8 @@ public class ImageProcessingActivity extends Activity 
        mTestNames[18] = "Intrinsics Convolve 3x3";

        mTestNames[19] = "ColorMatrix";

        mTestNames[20] = "Intrinsics ColorMatrix";

        mTestNames[21] = "Copy";

        mTestNames[21] = "Intrinsics ColorMatrix Grey";

        mTestNames[22] = "Copy";

        mTestSpinner.setAdapter(new ArrayAdapter<String>(

            this, R.layout.spinner_layout, mTestNames));

    }