commit 93eacc7ce0aad4314b4cb41a281f59ce54bb3286
author Jason Sams <jsams@google.com> Tue Dec 18 14:26:57 2012 -0800
committer Stephen Hines <srhines@google.com> Wed Dec 19 15:26:29 2012 -0800
tree 680d89e22de38ebba5315d132f4d3ec645a40e50
parent 38ac5d4092f32b08451c73ecabcf2ab21aef15d5

Cleanup diff with compat.

Change-Id: Ieedcdec03ccb05cac68cbebbd398e07cb885f4d3

driver/rsdAllocation.h

diff --git a/driver/rsdAllocation.h b/driver/rsdAllocation.h
index 5f916d1..d506dc4 100644
--- a/driver/rsdAllocation.h
+++ b/driver/rsdAllocation.h
@@ -42,9 +42,15 @@
     // 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 @@
     ANativeWindowBuffer *wndBuffer;
 };
 
+#ifndef RS_COMPATIBILITY_LIB
 GLenum rsdTypeToGLType(RsDataType t);
 GLenum rsdKindToGLFormat(RsDataKind k);
+#endif
 
 
 bool rsdAllocationInit(const android::renderscript::Context *rsc,