commit 21fa7a0a23eddab88ff261017f6d7a2548b4d89a
author Tim Murray <timmurray@google.com> Thu Aug 15 16:25:03 2013 -0700
committer Tim Murray <timmurray@google.com> Mon Aug 19 12:07:52 2013 -0700
tree 38d9b9d3dd271bf7b5eb09ba23b85ca793cdaf4f
parent 2d7d0b276ed4b3cedf72342a4d2ab287d4653ce0

Add error handling, move to create methods for intrinsics.

Change-Id: I81a0d481fef8b9396c648fdf18aee716a2056612

cpp/ScriptIntrinsics.cpp

diff --git a/cpp/ScriptIntrinsics.cpp b/cpp/ScriptIntrinsics.cpp
index 5653078..ab24952 100644
--- a/cpp/ScriptIntrinsics.cpp
+++ b/cpp/ScriptIntrinsics.cpp
@@ -30,6 +30,10 @@
 
 }
 
+sp<ScriptIntrinsic3DLUT> ScriptIntrinsic3DLUT::create(sp<RS> rs, sp<const Element> e) {
+    return new ScriptIntrinsic3DLUT(rs, e);
+}
+
 ScriptIntrinsic3DLUT::ScriptIntrinsic3DLUT(sp<RS> rs, sp<const Element> e)
     : ScriptIntrinsic(rs, RS_SCRIPT_INTRINSIC_ID_3DLUT, e) {
 
@@ -41,6 +45,10 @@
     Script::setVar(0, lut);
 }
 
+sp<ScriptIntrinsicBlend> ScriptIntrinsicBlend::create(sp<RS> rs, sp<const Element> e) {
+    return new ScriptIntrinsicBlend(rs, e);
+}
+
 ScriptIntrinsicBlend::ScriptIntrinsicBlend(sp<RS> rs, sp<const Element> e)
     : ScriptIntrinsic(rs, RS_SCRIPT_INTRINSIC_ID_BLEND, e) {
 }
@@ -110,13 +118,20 @@
 
 
 
+sp<ScriptIntrinsicBlur> ScriptIntrinsicBlur::create(sp<RS> rs, sp<const Element> e) {
+    return new ScriptIntrinsicBlur(rs, e);
+}
+
 ScriptIntrinsicBlur::ScriptIntrinsicBlur(sp<RS> rs, sp<const Element> e)
     : ScriptIntrinsic(rs, RS_SCRIPT_INTRINSIC_ID_BLUR, e) {
 
 }
 
-void ScriptIntrinsicBlur::blur(sp<Allocation> in, sp<Allocation> out) {
+void ScriptIntrinsicBlur::setInput(sp<Allocation> in) {
     Script::setVar(1, in);
+}
+
+void ScriptIntrinsicBlur::forEach(sp<Allocation> out) {
     Script::forEach(0, NULL, out, NULL, 0);
 }
 
@@ -126,6 +141,10 @@
 
 
 
+sp<ScriptIntrinsicColorMatrix> ScriptIntrinsicColorMatrix::create(sp<RS> rs, sp<const Element> e) {
+    return new ScriptIntrinsicColorMatrix(rs, e);
+}
+
 ScriptIntrinsicColorMatrix::ScriptIntrinsicColorMatrix(sp<RS> rs, sp<const Element> e)
     : ScriptIntrinsic(rs, RS_SCRIPT_INTRINSIC_ID_COLOR_MATRIX, e) {
 
@@ -163,6 +182,12 @@
     setColorMatrix3(matrix);
 }
 
+
+
+sp<ScriptIntrinsicConvolve3x3> ScriptIntrinsicConvolve3x3::create(sp<RS> rs, sp<const Element> e) {
+    return new ScriptIntrinsicConvolve3x3(rs, e);
+}
+
 ScriptIntrinsicConvolve3x3::ScriptIntrinsicConvolve3x3(sp<RS> rs, sp<const Element> e)
     : ScriptIntrinsic(rs, RS_SCRIPT_INTRINSIC_ID_CONVOLVE_3x3, e) {
 
@@ -180,6 +205,10 @@
     Script::setVar(0, (void*)v, sizeof(float) * 9);
 }
 
+sp<ScriptIntrinsicConvolve5x5> ScriptIntrinsicConvolve5x5::create(sp<RS> rs, sp<const Element> e) {
+    return new ScriptIntrinsicConvolve5x5(rs, e);
+}
+
 ScriptIntrinsicConvolve5x5::ScriptIntrinsicConvolve5x5(sp<RS> rs, sp<const Element> e)
     : ScriptIntrinsic(rs, RS_SCRIPT_INTRINSIC_ID_CONVOLVE_5x5, e) {
 
@@ -197,6 +226,10 @@
     Script::setVar(0, (void*)v, sizeof(float) * 25);
 }
 
+sp<ScriptIntrinsicHistogram> ScriptIntrinsicHistogram::create(sp<RS> rs, sp<const Element> e) {
+    return new ScriptIntrinsicHistogram(rs, e);
+}
+
 ScriptIntrinsicHistogram::ScriptIntrinsicHistogram(sp<RS> rs, sp<const Element> e)
     : ScriptIntrinsic(rs, RS_SCRIPT_INTRINSIC_ID_HISTOGRAM, e) {
 
@@ -232,6 +265,10 @@
     Script::forEach(1, ain, NULL, NULL, 0);
 }
 
+sp<ScriptIntrinsicLUT> ScriptIntrinsicLUT::create(sp<RS> rs, sp<const Element> e) {
+    return new ScriptIntrinsicLUT(rs, e);
+}
+
 ScriptIntrinsicLUT::ScriptIntrinsicLUT(sp<RS> rs, sp<const Element> e)
     : ScriptIntrinsic(rs, RS_SCRIPT_INTRINSIC_ID_LUT, e), mDirty(true) {
     LUT = Allocation::createSized(rs, e, 1024);
@@ -282,6 +319,10 @@
 
 }
 
+sp<ScriptIntrinsicYuvToRGB> ScriptIntrinsicYuvToRGB::create(sp<RS> rs, sp<const Element> e) {
+    return new ScriptIntrinsicYuvToRGB(rs, e);
+}
+
 ScriptIntrinsicYuvToRGB::ScriptIntrinsicYuvToRGB(sp<RS> rs, sp<const Element> e)
     : ScriptIntrinsic(rs, RS_SCRIPT_INTRINSIC_ID_YUV_TO_RGB, e) {