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

Commit 41f1e5ed authored by Stephen Hines's avatar Stephen Hines
Browse files

Check in older versions of RS tests. 

This change adds a v11 version of Fountain, as well as v11 and v14 versions of
RSTest. All tests currently build and pass on the required platforms.

This also fixes an initialization bug for RSTest running on older devices.
If we don't directly initialize "each" component of the vector types, it can
result in uninitialized memory (or zero) being used for divisors (particularly
with the char vector types). This triggers SIGFPE with the latest pending
Clang/LLVM rebase.

Change-Id: I92a70c2aeed4e20f110b1cb24ee926fc27be9dbb
parent 6435da61

tests/RenderScriptTests/Fountain_v11/Android.mk

0 → 100644
+32 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2008 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



ifneq ($(TARGET_SIMULATOR),true)



LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)



LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)

#LOCAL_STATIC_JAVA_LIBRARIES := android.renderscript



LOCAL_PACKAGE_NAME := Fountain_v11

LOCAL_SDK_VERSION := 11



include $(BUILD_PACKAGE)



endif

tests/RenderScriptTests/Fountain_v11/AndroidManifest.xml

0 → 100644
+15 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.fountain_v11">

    <uses-sdk android:minSdkVersion="11" />

    <application 

        android:label="Fountain_v11"

        android:icon="@drawable/test_pattern">

        <activity android:name="Fountain_v11">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

        </activity>

    </application>

</manifest>

tests/RenderScriptTests/Fountain_v11/_index.html

0 → 100644
+5 −0
Original line number Diff line number Diff line 
<p>An example that renders many dots on the screen that follow a user's touch. The dots fall 

to the bottom of the screen when the user releases the finger.</p>

tests/RenderScriptTests/Fountain_v11/res/drawable/test_pattern.png

0 → 100644
+307 B
Loading image diff...

tests/RenderScriptTests/Fountain_v11/src/com/android/fountain/FountainRS.java

0 → 100644
+72 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.fountain_v11;



import android.content.res.Resources;

import android.renderscript.*;

import android.util.Log;





public class FountainRS {

    public static final int PART_COUNT = 50000;



    public FountainRS() {

    }



    private Resources mRes;

    private RenderScriptGL mRS;

    private ScriptC_fountain mScript;

    public void init(RenderScriptGL rs, Resources res, int width, int height) {

        mRS = rs;

        mRes = res;



        ProgramFragmentFixedFunction.Builder pfb = new ProgramFragmentFixedFunction.Builder(rs);

        pfb.setVaryingColor(true);

        rs.bindProgramFragment(pfb.create());



        ScriptField_Point points = new ScriptField_Point(mRS, PART_COUNT);//

 //                                                        Allocation.USAGE_GRAPHICS_VERTEX);



        Mesh.AllocationBuilder smb = new Mesh.AllocationBuilder(mRS);

        smb.addVertexAllocation(points.getAllocation());

        smb.addIndexSetType(Mesh.Primitive.POINT);

        Mesh sm = smb.create();



        mScript = new ScriptC_fountain(mRS, mRes, R.raw.fountain);

        mScript.set_partMesh(sm);

        mScript.bind_point(points);

        mRS.bindRootScript(mScript);

    }



    boolean holdingColor[] = new boolean[10];

    public void newTouchPosition(float x, float y, float pressure, int id) {

        if (id >= holdingColor.length) {

            return;

        }

        int rate = (int)(pressure * pressure * 500.f);

        if (rate > 500) {

            rate = 500;

        }

        if (rate > 0) {

            mScript.invoke_addParticles(rate, x, y, id, !holdingColor[id]);

            holdingColor[id] = true;

        } else {

            holdingColor[id] = false;

        }



    }

}