commit c905efd76fdcc1b8846b229bf7d991d185a7b4b7
author Jason Sams <jsams@google.com> Mon Nov 26 15:20:18 2012 -0800
committer Jason Sams <jsams@google.com> Mon Nov 26 16:50:26 2012 -0800
tree 75fe787358f4cc02a661e2b262dad9ccd5d7df45
parent 76a1be4a35267cf0814fb85fb9b1b5bf887e6ae7

Cleanup pass + implement blur uchar

Change-Id: Ib7f1c5218663b468a3c11daa2c3373ae132145ac

Conflicts:

	cpu_ref/rsCpuIntrinsicBlend.cpp

cpu_ref/rsCpuIntrinsicYuvToRGB.cpp

diff --git a/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp b/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp
index 7b8f768..946d1ba 100644
--- a/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp
+++ b/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp
@@ -33,7 +33,7 @@
     virtual void setGlobalObj(uint32_t slot, ObjectBase *data);
 
     virtual ~RsdCpuScriptIntrinsicYuvToRGB();
-    RsdCpuScriptIntrinsicYuvToRGB(RsdCpuReferenceImpl *ctx, const Script *s);
+    RsdCpuScriptIntrinsicYuvToRGB(RsdCpuReferenceImpl *ctx, const Script *s, const Element *e);
 
 protected:
     ObjectBaseRef<Allocation> alloc;
@@ -144,8 +144,8 @@
 }
 
 RsdCpuScriptIntrinsicYuvToRGB::RsdCpuScriptIntrinsicYuvToRGB(
-            RsdCpuReferenceImpl *ctx, const Script *s)
-            : RsdCpuScriptIntrinsic(ctx, s, RS_SCRIPT_INTRINSIC_ID_YUV_TO_RGB) {
+            RsdCpuReferenceImpl *ctx, const Script *s, const Element *e)
+            : RsdCpuScriptIntrinsic(ctx, s, e, RS_SCRIPT_INTRINSIC_ID_YUV_TO_RGB) {
 
     mRootPtr = &kernel;
 }
@@ -162,8 +162,9 @@
 }
 
 
-RsdCpuScriptImpl * rsdIntrinsic_YuvToRGB(RsdCpuReferenceImpl *ctx, const Script *s) {
-    return new RsdCpuScriptIntrinsicYuvToRGB(ctx, s);
+RsdCpuScriptImpl * rsdIntrinsic_YuvToRGB(RsdCpuReferenceImpl *ctx,
+                                         const Script *s, const Element *e) {
+    return new RsdCpuScriptIntrinsicYuvToRGB(ctx, s, e);
 }