Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bf1f8df authored by Stephen Hines's avatar Stephen Hines
Browse files

DO NOT MERGE: Almost all warnings are now errors in RS build. 

Change-Id: Ie4952cdf5c75bf1b7a7899a32b3b1f8747686356
parent 3080b85c

libs/rs/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -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

+2 −2
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+0 −1
Original line number Diff line number Diff line
@@ -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

+0 −1
Original line number Diff line number Diff line
@@ -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);

}