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 /driver/rsdAllocation.h | |
| parent | 38ac5d4092f32b08451c73ecabcf2ab21aef15d5 (diff) | |
| download | rs-93eacc7ce0aad4314b4cb41a281f59ce54bb3286.tar.gz | |
Cleanup diff with compat.
Change-Id: Ieedcdec03ccb05cac68cbebbd398e07cb885f4d3
Diffstat (limited to 'driver/rsdAllocation.h')
| -rw-r--r-- | driver/rsdAllocation.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/driver/rsdAllocation.h b/driver/rsdAllocation.h index 5f916d16..d506dc46 100644 --- a/driver/rsdAllocation.h +++ b/driver/rsdAllocation.h @@ -42,9 +42,15 @@ struct DrvAllocation { // Is this a legal structure to be used as an FBO render target uint32_t renderTargetID; +#ifndef RS_COMPATIBILITY_LIB GLenum glTarget; GLenum glType; GLenum glFormat; +#else + int glTarget; + int glType; + int glFormat; +#endif bool uploadDeferred; @@ -53,8 +59,10 @@ struct DrvAllocation { ANativeWindowBuffer *wndBuffer; }; +#ifndef RS_COMPATIBILITY_LIB GLenum rsdTypeToGLType(RsDataType t); GLenum rsdKindToGLFormat(RsDataKind k); +#endif bool rsdAllocationInit(const android::renderscript::Context *rsc, |