drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split ScriptC from RenderScript.java. Implement state caching in the Builder objects.

Browse Source
This commit is contained in:
Jason Sams
2009-08-03 18:11:17 -07:00
parent 6dabc95687
commit 69f0d31e57
7 changed files with 240 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
graphics/java/android/renderscript/RenderScript.java
View File

@ -216,7 +216,6 @@ public class RenderScript {
}
public enum DepthFunc {
ALWAYS (0),
LESS (1),
@ -351,105 +350,6 @@ public class RenderScript {
return new TriangleMesh(id);
}
//////////////////////////////////////////////////////////////////////////////////
// Script
public class Script extends BaseObj {
Script(int id) {
super(RenderScript.this);
mID = id;
}
public void destroy() {
nScriptDestroy(mID);
mID = 0;
}
public void bindAllocation(Allocation va, int slot) {
nScriptBindAllocation(mID, va.mID, slot);
}
}
public void scriptCBegin() {
nScriptCBegin();
}
public void scriptCSetTimeZone(String timeZone) {
try {
byte[] bytes = timeZone.getBytes("UTF-8");
nScriptCSetTimeZone(bytes);
} catch (java.io.UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
}
public void scriptCSetClearColor(float r, float g, float b, float a) {
nScriptCSetClearColor(r, g, b, a);
}
public void scriptCSetClearDepth(float d) {
nScriptCSetClearDepth(d);
}
public void scriptCSetClearStencil(int stencil) {
nScriptCSetClearStencil(stencil);
}
public void scriptCAddType(Type t) {
nScriptCAddType(t.mID);
}
public void scriptCSetRoot(boolean r) {
nScriptCSetRoot(r);
}
public void scriptCSetScript(String s) {
try {
byte[] bytes = s.getBytes("UTF-8");
nScriptCSetScript(bytes, 0, bytes.length);
} catch (java.io.UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
}
public void scriptCSetScript(Resources resources, int id) {
InputStream is = resources.openRawResource(id);
try {
try {
scriptCSetScript(is);
} finally {
is.close();
}
} catch(IOException e) {
throw new Resources.NotFoundException();
}
}
public void scriptCSetScript(InputStream is) throws IOException {
byte[] buf = new byte[1024];
int currentPos = 0;
while(true) {
int bytesLeft = buf.length - currentPos;
if (bytesLeft == 0) {
byte[] buf2 = new byte[buf.length * 2];
System.arraycopy(buf, 0, buf2, 0, buf.length);
buf = buf2;
bytesLeft = buf.length - currentPos;
}
int bytesRead = is.read(buf, currentPos, bytesLeft);
if (bytesRead <= 0) {
break;
}
currentPos += bytesRead;
}
nScriptCSetScript(buf, 0, currentPos);
}
public Script scriptCCreate() {
int id = nScriptCCreate();
return new Script(id);
}
//////////////////////////////////////////////////////////////////////////////////
// ProgramVertex

91
graphics/java/android/renderscript/Script.java Normal file
View File

@ -0,0 +1,91 @@
/*
* 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 android.renderscript;
/**
* @hide
**/
public class Script extends BaseObj {
boolean mIsRoot;
Script(int id, RenderScript rs) {
super(rs);
mID = id;
}
public void destroy() {
mRS.nScriptDestroy(mID);
mID = 0;
}
public void bindAllocation(Allocation va, int slot) {
mRS.nScriptBindAllocation(mID, va.mID, slot);
}
public void setClearColor(float r, float g, float b, float a) {
//mRS.nScriptCSetClearColor(r, g, b, a);
}
public void setClearDepth(float d) {
//mRS.nScriptCSetClearDepth(d);
}
public void setClearStencil(int stencil) {
//mRS.nScriptCSetClearStencil(stencil);
}
public static class Builder {
RenderScript mRS;
boolean mIsRoot = false;
byte[] mTimeZone;
Builder(RenderScript rs) {
mRS = rs;
}
public void addType(Type t) {
mRS.nScriptCAddType(t.mID);
}
void transferCreate() {
if(mTimeZone != null) {
mRS.nScriptCSetTimeZone(mTimeZone);
}
mRS.nScriptCSetRoot(mIsRoot);
}
void transferObject(Script s) {
s.mIsRoot = mIsRoot;
}
public void setTimeZone(String timeZone) {
try {
mTimeZone = timeZone.getBytes("UTF-8");
} catch (java.io.UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
}
public void setRoot(boolean r) {
mIsRoot = r;
}
}
}

106
graphics/java/android/renderscript/ScriptC.java Normal file
View File

@ -0,0 +1,106 @@
/*
* 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 android.renderscript;
import java.io.IOException;
import java.io.InputStream;
import android.content.res.Resources;
/**
* @hide
**/
public class ScriptC extends Script {
ScriptC(int id, RenderScript rs) {
super(id, rs);
}
public static class Builder extends Script.Builder {
byte[] mProgram;
int mProgramLength;
public Builder(RenderScript rs) {
super(rs);
}
public void setScript(String s) {
try {
mProgram = s.getBytes("UTF-8");
mProgramLength = mProgram.length;
} catch (java.io.UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
}
public void setScript(Resources resources, int id) {
InputStream is = resources.openRawResource(id);
try {
try {
setScript(is);
} finally {
is.close();
}
} catch(IOException e) {
throw new Resources.NotFoundException();
}
}
public void setScript(InputStream is) throws IOException {
byte[] buf = new byte[1024];
int currentPos = 0;
while(true) {
int bytesLeft = buf.length - currentPos;
if (bytesLeft == 0) {
byte[] buf2 = new byte[buf.length * 2];
System.arraycopy(buf, 0, buf2, 0, buf.length);
buf = buf2;
bytesLeft = buf.length - currentPos;
}
int bytesRead = is.read(buf, currentPos, bytesLeft);
if (bytesRead <= 0) {
break;
}
currentPos += bytesRead;
}
mProgram = buf;
mProgramLength = currentPos;
}
static synchronized ScriptC internalCreate(Builder b) {
b.mRS.nScriptCBegin();
b.transferCreate();
b.mRS.nScriptCSetScript(b.mProgram, 0, b.mProgramLength);
int id = b.mRS.nScriptCCreate();
ScriptC obj = new ScriptC(id, b.mRS);
b.transferObject(obj);
return obj;
}
public ScriptC create() {
return internalCreate(this);
}
}
}

16
libs/rs/java/Film/src/com/android/film/FilmRS.java
View File

@ -29,6 +29,8 @@ import android.renderscript.RenderScript;
import android.renderscript.Element;
import android.renderscript.Allocation;
import android.renderscript.Dimension;
import android.renderscript.ScriptC;
import android.renderscript.Script;
public class FilmRS {
private final int POS_TRANSLATE = 0;
@ -66,8 +68,8 @@ public class FilmRS {
private Resources mRes;
private RenderScript mRS;
private RenderScript.Script mScriptStrip;
private RenderScript.Script mScriptImage;
private Script mScriptStrip;
private Script mScriptImage;
private Element mElementVertex;
private Element mElementIndex;
private RenderScript.Sampler mSampler;
@ -227,11 +229,11 @@ public class FilmRS {
Log.e("rs", "Done loading named");
mRS.scriptCBegin();
mRS.scriptCSetClearColor(0.0f, 0.0f, 0.0f, 1.0f);
mRS.scriptCSetScript(mRes, R.raw.filmstrip);
mRS.scriptCSetRoot(true);
mScriptStrip = mRS.scriptCCreate();
ScriptC.Builder sb = new ScriptC.Builder(mRS);
sb.setScript(mRes, R.raw.filmstrip);
sb.setRoot(true);
mScriptStrip = sb.create();
mScriptStrip.setClearColor(0.0f, 0.0f, 0.0f, 1.0f);
mAllocPos = Allocation.createSized(mRS,
Element.USER_FLOAT, mBufferPos.length);

14
libs/rs/java/Fountain/src/com/android/fountain/FountainRS.java
View File

@ -29,6 +29,8 @@ import android.renderscript.RenderScript;
import android.renderscript.ProgramVertexAlloc;
import android.renderscript.Element;
import android.renderscript.Allocation;
import android.renderscript.Script;
import android.renderscript.ScriptC;
public class FountainRS {
@ -57,7 +59,7 @@ public class FountainRS {
private Allocation mIntAlloc;
private Allocation mPartAlloc;
private Allocation mVertAlloc;
private RenderScript.Script mScript;
private Script mScript;
private RenderScript.ProgramFragmentStore mPFS;
private RenderScript.ProgramFragment mPF;
@ -98,11 +100,11 @@ public class FountainRS {
}
mPartAlloc.data(t2);
mRS.scriptCBegin();
mRS.scriptCSetClearColor(0.0f, 0.0f, 0.0f, 1.0f);
mRS.scriptCSetScript(mRes, R.raw.fountain);
mRS.scriptCSetRoot(true);
mScript = mRS.scriptCCreate();
ScriptC.Builder sb = new ScriptC.Builder(mRS);
sb.setScript(mRes, R.raw.fountain);
sb.setRoot(true);
mScript = sb.create();
mScript.setClearColor(0.0f, 0.0f, 0.0f, 1.0f);
mScript.bindAllocation(mIntAlloc, 0);
mScript.bindAllocation(mPartAlloc, 1);

18
libs/rs/java/Grass/src/com/android/grass/rs/GrassRS.java
View File

@ -27,10 +27,11 @@ import android.renderscript.RenderScript;
import android.renderscript.Allocation;
import android.renderscript.ProgramVertexAlloc;
import static android.renderscript.Element.*;
import static android.util.MathUtils.*;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.renderscript.Script;
import android.renderscript.ScriptC;
import java.util.TimeZone;
@ -66,7 +67,7 @@ class GrassRS {
private final int mHeight;
@SuppressWarnings({"FieldCanBeLocal"})
private RenderScript.Script mScript;
private Script mScript;
@SuppressWarnings({"FieldCanBeLocal"})
private RenderScript.Sampler mSampler;
@SuppressWarnings({"FieldCanBeLocal"})
@ -112,13 +113,12 @@ class GrassRS {
createProgramFragment();
createScriptStructures();
mRS.scriptCBegin();
mRS.scriptCSetClearColor(0.0f, 0.0f, 0.0f, 1.0f);
mRS.scriptCSetScript(mResources, R.raw.grass);
mRS.scriptCSetTimeZone(TimeZone.getDefault().getID());
mRS.scriptCSetRoot(true);
mScript = mRS.scriptCCreate();
ScriptC.Builder sb = new ScriptC.Builder(mRS);
sb.setScript(mResources, R.raw.grass);
sb.setTimeZone(TimeZone.getDefault().getID());
sb.setRoot(true);
mScript = sb.create();
mScript.setClearColor(0.0f, 0.0f, 0.0f, 1.0f);
loadSkyTextures();
mScript.bindAllocation(mState, RSID_STATE);

16
libs/rs/java/Rollo/src/com/android/rollo/RolloRS.java
View File

@ -22,6 +22,8 @@ import android.renderscript.RenderScript;
import android.renderscript.ProgramVertexAlloc;
import android.renderscript.Element;
import android.renderscript.Allocation;
import android.renderscript.Script;
import android.renderscript.ScriptC;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@ -90,7 +92,7 @@ public class RolloRS {
private Resources mRes;
private RenderScript mRS;
private RenderScript.Script mScript;
private Script mScript;
private RenderScript.Sampler mSampler;
private RenderScript.Sampler mSamplerText;
private RenderScript.ProgramFragmentStore mPFSBackground;
@ -313,12 +315,12 @@ public class RolloRS {
private void initRS() {
mRS.scriptCBegin();
mRS.scriptCSetClearColor(0.0f, 0.0f, 0.0f, 0.0f);
mRS.scriptCSetScript(mRes, R.raw.rollo);
//mRS.scriptCSetScript(mRes, R.raw.rollo2);
mRS.scriptCSetRoot(true);
mScript = mRS.scriptCCreate();
ScriptC.Builder sb = new ScriptC.Builder(mRS);
sb.setScript(mRes, R.raw.rollo);
//sb.setScript(mRes, R.raw.rollo2);
sb.setRoot(true);
mScript = sb.create();
mScript.setClearColor(0.0f, 0.0f, 0.0f, 0.0f);
mAllocStateBuf = new int[] {0, 0, 0, 8, 0, 0, -1, 0, mAllocIconIDBuf.length, 0, 0};
mAllocState = Allocation.createSized(mRS,