Merge "Almost all warnings are now errors in RS build."

libs/rs/Android.mk

@@ -124,6 +124,8 @@ LOCAL_STATIC_LIBRARIES := libdex libft2
 LOCAL_C_INCLUDES += external/freetype/include external/zlib dalvik
 LOCAL_C_INCLUDES += frameworks/compile/libbcc/include
 
+LOCAL_CFLAGS += -Werror -Wall -Wno-unused-parameter -Wno-unused-variable
+
 LOCAL_LDLIBS := -lpthread -ldl
 LOCAL_MODULE:= libRS
 LOCAL_MODULE_TAGS := optional
@@ -132,6 +134,7 @@ include $(BUILD_SHARED_LIBRARY)
 
 # Now build a host version for serialization
 include $(CLEAR_VARS)
+LOCAL_CFLAGS += -Werror -Wall -Wno-unused-parameter -Wno-unused-variable
 LOCAL_CFLAGS += -DANDROID_RS_SERIALIZE
 
 LOCAL_SRC_FILES:= \

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 {
 

libs/rs/rsContext.cpp

@@ -741,7 +741,7 @@ Context::~Context() {
         mWorkers.mLaunchSignals[ct].set();
     }
     for (uint32_t ct = 0; ct < mWorkers.mCount; ct++) {
-        int status = pthread_join(mWorkers.mThreadId[ct], &res);
+        status = pthread_join(mWorkers.mThreadId[ct], &res);
     }
     rsAssert(!mWorkers.mRunningCount);
 

libs/rs/rsHandcode.h

@@ -4,7 +4,6 @@
 static inline void rsHCAPI_ContextFinish (RsContext rsc) {
     ThreadIO *io = &((Context *)rsc)->mIO;
     uint32_t size = sizeof(RS_CMD_ContextFinish);
-    RS_CMD_ContextFinish *cmd = static_cast<RS_CMD_ContextFinish *>(io->mToCore.reserve(size));
     io->mToCore.commitSync(RS_CMD_ID_ContextFinish, size);
 }
 

libs/rs/rsScript.cpp

@@ -139,7 +139,6 @@ void rsi_ScriptSetVarD(Context *rsc, RsScript vs, uint32_t slot, double value) {
 }
 
 void rsi_ScriptSetVarV(Context *rsc, RsScript vs, uint32_t slot, const void *data, uint32_t len) {
-    const float *fp = (const float *)data;
     Script *s = static_cast<Script *>(vs);
     s->setVar(slot, data, len);
 }

libs/rs/rsScriptC_Lib.cpp

@@ -35,6 +35,7 @@ using namespace android::renderscript;
 // Math routines
 //////////////////////////////////////////////////////////////////////////////
 
+#if 0
 static float SC_sinf_fast(float x) {
     const float A =   1.0f / (2.0f * M_PI);
     const float B = -16.0f;
@@ -70,6 +71,7 @@ static float SC_cosf_fast(float x) {
     const float y = B * x * fabsf(x) + C * x;
     return 0.2215f * (y * fabsf(y) - y) + y;
 }
+#endif
 
 static float SC_randf(float max) {
     float r = (float)rand();

libs/rs/rsScriptC_LibCL.cpp

@@ -42,6 +42,7 @@ static float SC_mad(float v1, float v2, float v3) {
     return v1 * v2 + v3;
 }
 
+#if 0
 static float SC_pown(float v, int p) {
     return powf(v, (float)p);
 }
@@ -49,6 +50,7 @@ static float SC_pown(float v, int p) {
 static float SC_powr(float v, float p) {
     return powf(v, p);
 }
+#endif
 
 float SC_rootn(float v, int r) {
     return pow(v, 1.f / r);

libs/rs/rsScriptC_LibGL.cpp

@@ -281,11 +281,13 @@ static void SC_allocationSyncAll(RsAllocation va) {
     static_cast<Allocation *>(va)->syncAll(rsc, RS_ALLOCATION_USAGE_SCRIPT);
 }
 
+#if 0
 static void SC_allocationSyncAll2(RsAllocation va, RsAllocationUsageType source) {
     CHECK_OBJ(va);
     GET_TLS();
     static_cast<Allocation *>(va)->syncAll(rsc, source);
 }
+#endif
 
 static void SC_ClearColor(float r, float g, float b, float a) {
     GET_TLS();