diff options
author | Jason Sams <jsams@google.com> | 2012-12-18 14:26:57 -0800 |
---|---|---|
committer | Stephen Hines <srhines@google.com> | 2012-12-19 15:26:29 -0800 |
commit | 93eacc7ce0aad4314b4cb41a281f59ce54bb3286 (patch) | |
tree | 680d89e22de38ebba5315d132f4d3ec645a40e50 /rsRuntime.h | |
parent | 38ac5d4092f32b08451c73ecabcf2ab21aef15d5 (diff) | |
download | rs-93eacc7ce0aad4314b4cb41a281f59ce54bb3286.tar.gz |
Cleanup diff with compat.
Change-Id: Ieedcdec03ccb05cac68cbebbd398e07cb885f4d3
Diffstat (limited to 'rsRuntime.h')
-rw-r--r-- | rsRuntime.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/rsRuntime.h b/rsRuntime.h index 3a20cb03..390338bf 100644 --- a/rsRuntime.h +++ b/rsRuntime.h @@ -29,6 +29,9 @@ namespace renderscript { // Context ////////////////////////////////////////////////////////////////////////////// +void rsrAllocationSyncAll(Context *, Script *, Allocation *); + +#ifndef RS_COMPATIBILITY_LIB void rsrBindTexture(Context *, ProgramFragment *, uint32_t slot, Allocation *); void rsrBindConstant(Context *, ProgramFragment *, uint32_t slot, Allocation *); void rsrBindConstant(Context *, ProgramVertex*, uint32_t slot, Allocation *); @@ -73,6 +76,7 @@ void rsrMeshComputeBoundingBox(Context *, Mesh *, void rsrColor(Context *, float r, float g, float b, float a); +#endif void rsrAllocationCopy1DRange(Context *, Allocation *dstAlloc, uint32_t dstOff, @@ -88,6 +92,7 @@ void rsrAllocationCopy2DRange(Context *, Allocation *dstAlloc, uint32_t srcXoff, uint32_t srcYoff, uint32_t srcMip, uint32_t srcFace); +#ifndef RS_COMPATIBILITY_LIB void rsrPrepareClear(Context *); uint32_t rsrGetWidth(Context *); uint32_t rsrGetHeight(Context *); @@ -101,6 +106,7 @@ void rsrMeasureText(Context *, const char *text, int32_t *left, int32_t *right, int32_t *top, int32_t *bottom); void rsrBindFont(Context *, Font *); void rsrFontColor(Context *, float r, float g, float b, float a); +#endif ////////////////////////////////////////////////////////////////////////////// // Time routines |