Cleanup error message for null binding address.
Only print the debug if script debugging is enabled.
Change-Id: I72b9c2a73d49987a73b354442e9defec02b93bc6
Implement inner utiliy class to specify surface formats.
Remove boxed bitmap upload functions.
Change-Id: I3ff5ca59e53d02b9d75277afa947ea3d218459eb
diff --git a/java/Fountain/src/com/android/fountain/FountainView.java b/java/Fountain/src/com/android/fountain/FountainView.java
index c141165..987bebe 100644
--- a/java/Fountain/src/com/android/fountain/FountainView.java
+++ b/java/Fountain/src/com/android/fountain/FountainView.java
@@ -52,7 +52,8 @@
public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
super.surfaceChanged(holder, format, w, h);
if (mRS == null) {
- mRS = createRenderScript(false);
+ RenderScriptGL.SurfaceConfig sc = new RenderScriptGL.SurfaceConfig();
+ mRS = createRenderScript(sc);
mRS.contextSetSurface(w, h, holder.getSurface());
mRender = new FountainRS();
mRender.init(mRS, getResources(), w, h);
diff --git a/java/ModelViewer/src/com/android/modelviewer/SceneGraphRS.java b/java/ModelViewer/src/com/android/modelviewer/SceneGraphRS.java
index b5592f0..81bd578 100644
--- a/java/ModelViewer/src/com/android/modelviewer/SceneGraphRS.java
+++ b/java/ModelViewer/src/com/android/modelviewer/SceneGraphRS.java
@@ -128,7 +128,7 @@
}
private void loadImage() {
- mGridImage = Allocation.createFromBitmapResourceBoxed(mRS, mRes, R.drawable.robot, Element.RGB_565(mRS), true);
+ mGridImage = Allocation.createFromBitmapResource(mRS, mRes, R.drawable.robot, Element.RGB_565(mRS), true);
mGridImage.uploadToTexture(0);
mScript.set_gTGrid(mGridImage);
diff --git a/java/ModelViewer/src/com/android/modelviewer/SceneGraphView.java b/java/ModelViewer/src/com/android/modelviewer/SceneGraphView.java
index 44a59b2..9457fd7 100644
--- a/java/ModelViewer/src/com/android/modelviewer/SceneGraphView.java
+++ b/java/ModelViewer/src/com/android/modelviewer/SceneGraphView.java
@@ -53,7 +53,9 @@
public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
super.surfaceChanged(holder, format, w, h);
if (mRS == null) {
- mRS = createRenderScript(true);
+ RenderScriptGL.SurfaceConfig sc = new RenderScriptGL.SurfaceConfig();
+ sc.setDepth(16, 24);
+ mRS = createRenderScript(sc);
mRS.contextSetSurface(w, h, holder.getSurface());
mRender = new SceneGraphRS();
mRender.init(mRS, getResources(), w, h);
diff --git a/java/ModelViewer/src/com/android/modelviewer/SimpleModelRS.java b/java/ModelViewer/src/com/android/modelviewer/SimpleModelRS.java
index afbf30b..ccbecd8 100644
--- a/java/ModelViewer/src/com/android/modelviewer/SimpleModelRS.java
+++ b/java/ModelViewer/src/com/android/modelviewer/SimpleModelRS.java
@@ -124,7 +124,7 @@
}
private void loadImage() {
- mGridImage = Allocation.createFromBitmapResourceBoxed(mRS, mRes, R.drawable.robot, Element.RGB_565(mRS), true);
+ mGridImage = Allocation.createFromBitmapResource(mRS, mRes, R.drawable.robot, Element.RGB_565(mRS), true);
mGridImage.uploadToTexture(0);
mScript.set_gTGrid(mGridImage);
diff --git a/java/ModelViewer/src/com/android/modelviewer/SimpleModelView.java b/java/ModelViewer/src/com/android/modelviewer/SimpleModelView.java
index 2574fdd..4253085 100644
--- a/java/ModelViewer/src/com/android/modelviewer/SimpleModelView.java
+++ b/java/ModelViewer/src/com/android/modelviewer/SimpleModelView.java
@@ -53,7 +53,9 @@
public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
super.surfaceChanged(holder, format, w, h);
if (mRS == null) {
- mRS = createRenderScript(true);
+ RenderScriptGL.SurfaceConfig sc = new RenderScriptGL.SurfaceConfig();
+ sc.setDepth(16, 24);
+ mRS = createRenderScript(sc);
mRS.contextSetSurface(w, h, holder.getSurface());
mRender = new SimpleModelRS();
mRender.init(mRS, getResources(), w, h);
diff --git a/java/Samples/src/com/android/samples/RsListView.java b/java/Samples/src/com/android/samples/RsListView.java
index b98ea08..cd66fbb 100644
--- a/java/Samples/src/com/android/samples/RsListView.java
+++ b/java/Samples/src/com/android/samples/RsListView.java
@@ -53,7 +53,9 @@
public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
super.surfaceChanged(holder, format, w, h);
if (mRS == null) {
- mRS = createRenderScript(true);
+ RenderScriptGL.SurfaceConfig sc = new RenderScriptGL.SurfaceConfig();
+ sc.setDepth(16, 24);
+ mRS = createRenderScript(sc);
mRS.contextSetSurface(w, h, holder.getSurface());
mRender = new RsListRS();
mRender.init(mRS, getResources(), w, h);
diff --git a/java/Samples/src/com/android/samples/RsRenderStatesView.java b/java/Samples/src/com/android/samples/RsRenderStatesView.java
index 5548de3..c434c09 100644
--- a/java/Samples/src/com/android/samples/RsRenderStatesView.java
+++ b/java/Samples/src/com/android/samples/RsRenderStatesView.java
@@ -53,7 +53,9 @@
public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
super.surfaceChanged(holder, format, w, h);
if (mRS == null) {
- mRS = createRenderScript(true);
+ RenderScriptGL.SurfaceConfig sc = new RenderScriptGL.SurfaceConfig();
+ sc.setDepth(16, 24);
+ mRS = createRenderScript(sc);
mRS.contextSetSurface(w, h, holder.getSurface());
mRender = new RsRenderStatesRS();
mRender.init(mRS, getResources(), w, h);
diff --git a/java/tests/src/com/android/rs/test/RSTestView.java b/java/tests/src/com/android/rs/test/RSTestView.java
index b811d48..c65f8c6 100644
--- a/java/tests/src/com/android/rs/test/RSTestView.java
+++ b/java/tests/src/com/android/rs/test/RSTestView.java
@@ -52,7 +52,8 @@
public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
super.surfaceChanged(holder, format, w, h);
if (mRS == null) {
- mRS = createRenderScript(false);
+ RenderScriptGL.SurfaceConfig sc = new RenderScriptGL.SurfaceConfig();
+ mRS = createRenderScript(sc);
mRS.contextSetSurface(w, h, holder.getSurface());
mRender = new RSTestCore();
mRender.init(mRS, getResources(), w, h);
diff --git a/rs.spec b/rs.spec
index 0da637e..a1c0671 100644
--- a/rs.spec
+++ b/rs.spec
@@ -145,16 +145,6 @@
ret RsAllocation
}
-AllocationCreateFromBitmapBoxed {
- param uint32_t width
- param uint32_t height
- param RsElement dstFmt
- param RsElement srcFmt
- param bool genMips
- param const void * data
- ret RsAllocation
- }
-
AllocationUploadToTexture {
param RsAllocation alloc
diff --git a/rsScript.cpp b/rsScript.cpp
index 0e76dae..c2f9689 100644
--- a/rsScript.cpp
+++ b/rsScript.cpp
@@ -66,7 +66,9 @@
memcpy(destPtr, val, len);
//LOGE("setVar f2 %f", ((const float *)destPtr)[0]);
} else {
- LOGE("Calling setVar on slot = %i which is null", slot);
+ //if (rsc->props.mLogScripts) {
+ LOGV("Calling setVar on slot = %i which is null", slot);
+ //}
}
}
diff --git a/rsScriptC.cpp b/rsScriptC.cpp
index d961fed..e60255a 100644
--- a/rsScriptC.cpp
+++ b/rsScriptC.cpp
@@ -81,7 +81,9 @@
if (dest) {
*dest = ptr;
} else {
- LOGE("ScriptC::setupScript, NULL var binding address.");
+ if (rsc->props.mLogScripts) {
+ LOGV("ScriptC::setupScript, NULL var binding address.");
+ }
}
}
}