diff options
| author | Tim Murray <timmurray@google.com> | 2013-07-29 14:30:02 -0700 |
|---|---|---|
| committer | Tim Murray <timmurray@google.com> | 2013-08-01 14:14:07 -0700 |
| commit | 89daad6bae798779e57f252e9da4fe4e62337124 (patch) | |
| tree | c55735f278a67b2fe5b74b42581cbfae9c99846c /cpp/Sampler.cpp | |
| parent | dcfaa3c0bf151da7be31463bb3fa4e2b4aea6b8c (diff) | |
Add basic support for intrinsics. Move sp<> into RScpp.
Change-Id: I74cdee7069a624ded5091d53db3a4b8ce9894033
Diffstat (limited to 'cpp/Sampler.cpp')
| -rw-r--r-- | cpp/Sampler.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/Sampler.cpp b/cpp/Sampler.cpp index fa6b2fda..a1f46691 100644 --- a/cpp/Sampler.cpp +++ b/cpp/Sampler.cpp @@ -15,7 +15,6 @@ */ #include "RenderScript.h" -#include <rs.h> using namespace android; using namespace RSC; @@ -58,7 +57,7 @@ sp<Sampler> Sampler::create(sp<RS> rs, RsSamplerValue min, RsSamplerValue mag, R #define CREATE_SAMPLER(N, MIN, MAG, WRAPS, WRAPT) sp<const Sampler> Sampler::N(sp<RS> rs) { \ if (rs->mSamplers.N == NULL) { \ - rs->mSamplers.N = (create(rs, MIN, MAG, WRAPS, WRAPT, 0.f)).get(); \ + rs->mSamplers.N = (create(rs, MIN, MAG, WRAPS, WRAPT, 0.f)); \ } \ return rs->mSamplers.N; \ } |