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

Commit d416398c authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Re-enable -Werror on clang"

parents 734ae355 c36df952

libs/hwui/Android.common.mk

+1 −10
Original line number Diff line number Diff line 
# getConfig in external/skia/include/core/SkBitmap.h is deprecated.

# Allow Gnu extension: in-class initializer of static 'const float' member.

# DeferredLayerUpdater.h: private field 'mRenderThread' is not used.

LOCAL_CLANG_CFLAGS += \

    -Wno-deprecated-declarations \

    -Wno-gnu-static-float-init \

    -Wno-unused-private-field



LOCAL_SRC_FILES := \

    font/CacheTexture.cpp \
@@ -119,9 +115,4 @@ endif 
# Defaults for ATRACE_TAG and LOG_TAG for libhwui

LOCAL_CFLAGS += -DATRACE_TAG=ATRACE_TAG_VIEW -DLOG_TAG=\"OpenGLRenderer\"

LOCAL_CFLAGS += -Wall -Wno-unused-parameter -Wunreachable-code

LOCAL_CFLAGS += -ffast-math -O3



# b/21698669

ifneq ($(USE_CLANG_PLATFORM_BUILD),true)

    LOCAL_CFLAGS += -Werror

endif
 
LOCAL_CFLAGS += -ffast-math -O3 -Werror

libs/hwui/DeferredLayerUpdater.cpp

+2 −3
Original line number Diff line number Diff line
@@ -24,14 +24,13 @@ 
namespace android {

namespace uirenderer {



DeferredLayerUpdater::DeferredLayerUpdater(renderthread::RenderThread& thread, Layer* layer)

DeferredLayerUpdater::DeferredLayerUpdater(Layer* layer)

        : mSurfaceTexture(nullptr)

        , mTransform(nullptr)

        , mNeedsGLContextAttach(false)

        , mUpdateTexImage(false)

        , mLayer(layer)

        , mCaches(Caches::getInstance())

        , mRenderThread(thread) {

        , mCaches(Caches::getInstance()) {

    mWidth = mLayer->layer.getWidth();

    mHeight = mLayer->layer.getHeight();

    mBlend = mLayer->isBlend();

libs/hwui/DeferredLayerUpdater.h

+1 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ class DeferredLayerUpdater : public VirtualLightRefBase { 
public:

    // Note that DeferredLayerUpdater assumes it is taking ownership of the layer

    // and will not call incrementRef on it as a result.

    ANDROID_API DeferredLayerUpdater(renderthread::RenderThread& thread, Layer* layer);

    ANDROID_API DeferredLayerUpdater(Layer* layer);

    ANDROID_API ~DeferredLayerUpdater();



    ANDROID_API bool setSize(int width, int height) {
@@ -101,7 +101,6 @@ private: 


    Layer* mLayer;

    Caches& mCaches;

    renderthread::RenderThread& mRenderThread;



    void doUpdateTexImage();

};

libs/hwui/renderthread/RenderProxy.cpp

+2 −3
Original line number Diff line number Diff line
@@ -271,16 +271,15 @@ void RenderProxy::runWithGlContext(RenderTask* gltask) { 
    postAndWait(task);

}



CREATE_BRIDGE2(createTextureLayer, RenderThread* thread, CanvasContext* context) {

CREATE_BRIDGE1(createTextureLayer, CanvasContext* context) {

    Layer* layer = args->context->createTextureLayer();

    if (!layer) return nullptr;

    return new DeferredLayerUpdater(*args->thread, layer);

    return new DeferredLayerUpdater(layer);

}



DeferredLayerUpdater* RenderProxy::createTextureLayer() {

    SETUP_TASK(createTextureLayer);

    args->context = mContext;

    args->thread = &mRenderThread;

    void* retval = postAndWait(task);

    DeferredLayerUpdater* layer = reinterpret_cast<DeferredLayerUpdater*>(retval);

    return layer;

libs/hwui/tests/TestContext.cpp

+2 −4
Original line number Diff line number Diff line
@@ -57,10 +57,7 @@ sp<Surface> TestContext::surface() { 
}



void TestContext::waitForVsync() {

#if HWUI_NULL_GPU

    return;

#endif



#if !HWUI_NULL_GPU

    // Request vsync

    mDisplayEventReceiver.requestNextVsync();
@@ -70,6 +67,7 @@ void TestContext::waitForVsync() { 
    // Drain it

    DisplayEventReceiver::Event buf[100];

    while (mDisplayEventReceiver.getEvents(buf, 100) > 0) { }

#endif

}



} // namespace test