Pass RsExpandKernelDriverInfo not RsExpandKernelParams.

Which is to say: retire RsExpandKernelParams and pass RsExpandKernelDriverInfo
directly to kernel wrapper functions instead.

Requires related change in frameworks/compile/libbcc.

Change-Id: I453f45ec18f389e88e27fcfa57ddf245d077cb98

1 files changed, 0 insertions, 48 deletions

diff --git a/cpu_ref/rsCpuCore.h b/cpu_ref/rsCpuCore.h
index 5f1913f4..afe8ef5d 100644
--- a/cpu_ref/rsCpuCore.h
+++ b/cpu_ref/rsCpuCore.h
@@ -25,9 +25,6 @@
 #include "rsScriptC.h"
 #include "rsCpuCoreRuntime.h"
 
-
-#define RS_KERNEL_INPUT_LIMIT 8
-
 namespace bcc {
     class BCCContext;
     class RSCompilerDriver;
@@ -37,51 +34,6 @@ namespace bcc {
 namespace android {
 namespace renderscript {
 
-struct StridePair {
-  uint32_t eStride;
-  uint32_t yStride;
-};
-
-struct RsLaunchDimensions {
-    uint32_t x;
-    uint32_t y;
-    uint32_t z;
-    uint32_t lod;
-    uint32_t face;
-    uint32_t array[4 /*make a define*/];
-};
-
-struct RsExpandKernelDriverInfo {
-    // Warning: This structure is shared with the compiler
-    // Any change to the fields here requires a matching compiler change
-
-    const uint8_t *inPtr[RS_KERNEL_INPUT_LIMIT];
-    uint32_t inStride[RS_KERNEL_INPUT_LIMIT];
-    uint32_t inLen;
-
-    uint8_t *outPtr[RS_KERNEL_INPUT_LIMIT];
-    uint32_t outStride[RS_KERNEL_INPUT_LIMIT];
-    uint32_t outLen;
-
-    // Dimension of the launch
-    RsLaunchDimensions dim;
-
-    // The walking itterator of the launch
-    RsLaunchDimensions current;
-
-    const void *usr;
-    uint32_t usrLen;
-
-
-
-    // Items below this line are not used by the compiler and can be change in the driver
-    uint32_t lid;
-    uint32_t slot;
-
-};
-
-typedef ::RsExpandKernelParams RsExpandKernelParams;
-
 extern bool gArchUseSIMD;
 
 typedef void (* InvokeFunc_t)(void);