commit 8a588bd9d34088ed89ef2c192c32ea2301e601bc
author Stephen Hines <srhines@google.com> Tue Nov 26 15:38:31 2013 -0800
committer Stephen Hines <srhines@google.com> Tue Nov 26 16:56:30 2013 -0800
tree 8c55a31502d2edba474c7460c3db56cc37fff898
parent b98626d1da831c5ced7d74d374a3242cbb82c3a5

Fix problems with NDK Sampler implementation.

Creation methods should be static and we need to use the proper Context
pointer for the dispatch methods.

Change-Id: I43c25a7348c9a9aa9a2a82e184d4ac644625800b

cpp/rsCppStructs.h

diff --git a/cpp/rsCppStructs.h b/cpp/rsCppStructs.h
index 1efd128..6834544 100644
--- a/cpp/rsCppStructs.h
+++ b/cpp/rsCppStructs.h
@@ -1917,7 +1917,7 @@
      *
      * @return Sampler
      */
-    sp<const Sampler> CLAMP_NEAREST(sp<RS> rs);
+    static sp<const Sampler> CLAMP_NEAREST(sp<RS> rs);
     /**
      * Retrieve a sampler with min and mag set to linear and wrap modes set to
      * clamp.
@@ -1926,7 +1926,7 @@
      *
      * @return Sampler
      */
-    sp<const Sampler> CLAMP_LINEAR(sp<RS> rs);
+    static sp<const Sampler> CLAMP_LINEAR(sp<RS> rs);
     /**
      * Retrieve a sampler with mag set to linear, min linear mipmap linear, and
      * wrap modes set to clamp.
@@ -1935,7 +1935,7 @@
      *
      * @return Sampler
      */
-    sp<const Sampler> CLAMP_LINEAR_MIP_LINEAR(sp<RS> rs);
+    static sp<const Sampler> CLAMP_LINEAR_MIP_LINEAR(sp<RS> rs);
     /**
      * Retrieve a sampler with min and mag set to nearest and wrap modes set to
      * wrap.
@@ -1944,7 +1944,7 @@
      *
      * @return Sampler
      */
-    sp<const Sampler> WRAP_NEAREST(sp<RS> rs);
+    static sp<const Sampler> WRAP_NEAREST(sp<RS> rs);
     /**
      * Retrieve a sampler with min and mag set to linear and wrap modes set to
      * wrap.
@@ -1953,7 +1953,7 @@
      *
      * @return Sampler
      */
-    sp<const Sampler> WRAP_LINEAR(sp<RS> rs);
+    static sp<const Sampler> WRAP_LINEAR(sp<RS> rs);
     /**
      * Retrieve a sampler with mag set to linear, min linear mipmap linear, and
      * wrap modes set to wrap.
@@ -1962,7 +1962,7 @@
      *
      * @return Sampler
      */
-    sp<const Sampler> WRAP_LINEAR_MIP_LINEAR(sp<RS> rs);
+    static sp<const Sampler> WRAP_LINEAR_MIP_LINEAR(sp<RS> rs);
     /**
      * Retrieve a sampler with min and mag set to nearest and wrap modes set to
      * mirrored repeat.
@@ -1971,7 +1971,7 @@
      *
      * @return Sampler
      */
-    sp<const Sampler> MIRRORED_REPEAT_NEAREST(sp<RS> rs);
+    static sp<const Sampler> MIRRORED_REPEAT_NEAREST(sp<RS> rs);
     /**
      * Retrieve a sampler with min and mag set to linear and wrap modes set to
      * mirrored repeat.
@@ -1980,7 +1980,7 @@
      *
      * @return Sampler
      */
-    sp<const Sampler> MIRRORED_REPEAT_LINEAR(sp<RS> rs);
+    static sp<const Sampler> MIRRORED_REPEAT_LINEAR(sp<RS> rs);
     /**
      * Retrieve a sampler with min and mag set to linear and wrap modes set to
      * mirrored repeat.
@@ -1989,7 +1989,7 @@
      *
      * @return Sampler
      */
-    sp<const Sampler> MIRRORED_REPEAT_LINEAR_MIP_LINEAR(sp<RS> rs);
+    static sp<const Sampler> MIRRORED_REPEAT_LINEAR_MIP_LINEAR(sp<RS> rs);
 
 };