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 /tests | |
| parent | dcfaa3c0bf151da7be31463bb3fa4e2b4aea6b8c (diff) | |
| download | rs-89daad6bae798779e57f252e9da4fe4e62337124.tar.gz | |
Add basic support for intrinsics. Move sp<> into RScpp.
Change-Id: I74cdee7069a624ded5091d53db3a4b8ce9894033
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/cppbasic/Android.mk | 11 | ||||
| -rw-r--r-- | tests/cppbasic/compute.cpp | 15 |
2 files changed, 8 insertions, 18 deletions
diff --git a/tests/cppbasic/Android.mk b/tests/cppbasic/Android.mk index 5c2c53ad..bf7725a5 100644 --- a/tests/cppbasic/Android.mk +++ b/tests/cppbasic/Android.mk @@ -6,18 +6,18 @@ LOCAL_SRC_FILES:= \ compute.cpp LOCAL_SHARED_LIBRARIES := \ - libRS \ - libRScpp \ libz \ - libcutils \ - libutils \ libEGL \ libGLESv1_CM \ libGLESv2 \ libui \ libbcc \ libbcinfo \ - libgui + libgui \ + libdl \ + libRScpp \ + libstlport + LOCAL_MODULE:= rstest-compute @@ -25,6 +25,7 @@ LOCAL_MODULE_TAGS := tests intermediates := $(call intermediates-dir-for,STATIC_LIBRARIES,libRS,TARGET,) +LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include LOCAL_C_INCLUDES += frameworks/rs/cpp LOCAL_C_INCLUDES += frameworks/rs LOCAL_C_INCLUDES += $(intermediates) diff --git a/tests/cppbasic/compute.cpp b/tests/cppbasic/compute.cpp index 0f7bd187..bc80c7ea 100644 --- a/tests/cppbasic/compute.cpp +++ b/tests/cppbasic/compute.cpp @@ -32,7 +32,7 @@ int main(int argc, char** argv) sp<Allocation> aout = Allocation::createTyped(rs, t); printf("Allocation %p %p\n", ain.get(), aout.get()); - sp<ScriptC_mono> sc = new ScriptC_mono(rs); + ScriptC_mono* sc = new ScriptC_mono(rs); printf("new script\n"); // We read back the status from the script-side via a "failed" allocation. @@ -84,21 +84,10 @@ int main(int argc, char** argv) rs->finish(); failed_alloc->copy1DTo(&failed); - - e.clear(); - t.clear(); - kern1_in.clear(); - kern1_out.clear(); } printf("Deleting stuff\n"); - sc.clear(); - t.clear(); - a1.clear(); - e.clear(); - ain.clear(); - aout.clear(); - // delete rs; + delete sc; printf("Delete OK\n"); if (failed) { |