commit 1531487e04ef5f61949bea7a3e2977279b38b0c2
author Tim Murray <timmurray@google.com> Wed Mar 27 11:58:05 2013 -0700
committer Tim Murray <timmurray@google.com> Wed Mar 27 11:58:05 2013 -0700
tree 275a192ca6c284005981ded8560d313396217cef
parent c3dceb11d9bfc0b741f993958e84edbaed552aff

Revert "rsSampler work"

This reverts commit ee883164d3fec165134b17e52c75cc90f3980269.

lib/Renderscript/runtime/rs_sample.c

diff --git a/lib/Renderscript/runtime/rs_sample.c b/lib/Renderscript/runtime/rs_sample.c
index b6621ec..c31efdc 100644
--- a/lib/Renderscript/runtime/rs_sample.c
+++ b/lib/Renderscript/runtime/rs_sample.c
@@ -2,7 +2,6 @@
 #include "rs_graphics.rsh"
 #include "rs_structs.h"
 
-#if 0
 /**
 * Allocation sampling
 */
@@ -379,51 +378,23 @@
     location.y = wrapI(wrapT, iPixel.y, sourceH);
     return getNearestSample(a, location, vecSize, dt, lod);
 }
-#endif
-
-
-typedef float4 (*fnSample1D) (rs_allocation a, rs_sampler s,
-                              float uv, float lod);
-typedef float4 (*fnSample2D) (rs_allocation a, rs_sampler s,
-                              float2 uv, float lod);
-typedef float4 (*fnSample3D) (rs_allocation a, rs_sampler s,
-                              float3 uv, float lod);
-
-
-
-
-extern const float4 __attribute__((overloadable))
-        rsSample(rs_allocation a, rs_sampler s, float location, float lod) {
-    rs_element elem = rsAllocationGetElement(a);
-    rs_data_kind dk = rsElementGetDataKind(elem);
-    rs_data_type dt = rsElementGetDataType(elem);
-
-    Sampler_t *prog = (Sampler_t *)s.p;
-    fnSample1D *tbl = (fnSample1D*)prog->mHal.drv;
-    return tbl[dk - 7](a, s, location, lod);
-}
 
 extern const float4 __attribute__((overloadable))
         rsSample(rs_allocation a, rs_sampler s, float location) {
-    return rsSample(a, s, location, 0.f);
+    return rsSample(a, s, location, 0);
+}
+
+extern const float4 __attribute__((overloadable))
+        rsSample(rs_allocation a, rs_sampler s, float uv, float lod) {
+    SAMPLE_FUNC_BODY()
+}
+
+extern const float4 __attribute__((overloadable))
+        rsSample(rs_allocation a, rs_sampler s, float2 location) {
+    return rsSample(a, s, location, 0.0f);
 }
 
 extern const float4 __attribute__((overloadable))
         rsSample(rs_allocation a, rs_sampler s, float2 uv, float lod) {
-
-    rs_element elem = rsAllocationGetElement(a);
-    rs_data_kind dk = rsElementGetDataKind(elem);
-    rs_data_type dt = rsElementGetDataType(elem);
-
-    Sampler_t *prog = (Sampler_t *)s.p;
-    fnSample2D *tbl = (fnSample2D*)prog->mHal.drv;
-    return tbl[dk](a, s, uv, lod);
+    SAMPLE_FUNC_BODY()
 }
-
-extern const float4 __attribute__((overloadable))
-        rsSample(rs_allocation a, rs_sampler s, float2 uv) {
-
-    return rsSample(a, s, uv, 0.f);
-}
-
-

lib/Renderscript/runtime/rs_structs.h

diff --git a/lib/Renderscript/runtime/rs_structs.h b/lib/Renderscript/runtime/rs_structs.h
index 4a32e79..4ee066e 100644
--- a/lib/Renderscript/runtime/rs_structs.h
+++ b/lib/Renderscript/runtime/rs_structs.h
@@ -137,10 +137,8 @@
  *
  *****************************************************************************/
 typedef struct Sampler {
-    char __pad[28];
-
+    char __pad[32];
     struct {
-        void *drv;
         struct {
             rs_sampler_value magFilter;
             rs_sampler_value minFilter;