diff options
| author | 2011-03-03 16:14:00 -0800 | |
|---|---|---|
| committer | 2011-03-03 16:14:00 -0800 | |
| commit | 6e71c954faff34b78a2952436b4f48d84a8c20cd (patch) | |
| tree | e7e35a26c22f3ff6a00a739608aa9e82e8f2efb8 /libs/rs/rsAllocation.cpp | |
| parent | 389bf4f734f1820e31f8807d117b6b15ded9ff8b (diff) | |
| parent | 1bf1f8df178170ee3d4224f3c92a1b724d783178 (diff) | |
Merge "DO NOT MERGE: Almost all warnings are now errors in RS build." into honeycomb-mr1
Diffstat (limited to 'libs/rs/rsAllocation.cpp')
| -rw-r--r-- | libs/rs/rsAllocation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/rs/rsAllocation.cpp b/libs/rs/rsAllocation.cpp index 54dcbcbefc30..ec03a158871f 100644 --- a/libs/rs/rsAllocation.cpp +++ b/libs/rs/rsAllocation.cpp @@ -21,8 +21,6 @@ #include <GLES/glext.h> #endif //ANDROID_RS_SERIALIZE -static void rsaAllocationGenerateScriptMips(RsContext con, RsAllocation va); - using namespace android; using namespace android::renderscript; @@ -602,6 +600,8 @@ void Allocation::resize2D(Context *rsc, uint32_t dimX, uint32_t dimY) { // #ifndef ANDROID_RS_SERIALIZE +static void rsaAllocationGenerateScriptMips(RsContext con, RsAllocation va); + namespace android { namespace renderscript { |