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

Commit d3448e43 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh
Browse files

Suppress Clang compilation warnings. 

Ignore warnings about unused parameters and initialization of static
constant float data members.

Change one potential error of allocating variable length
array of non-POD element type on stack.

Fix mismatch of class and struct declaration tags.

BUG: 17512760
Change-Id: I3a09c945fb1c17f27aff74a7e439dd4c35d1fb32
parent ced7ebdb

libs/hwui/Android.mk

+8 −0
Original line number Diff line number Diff line
@@ -2,6 +2,14 @@ LOCAL_PATH:= $(call my-dir) 
include $(CLEAR_VARS)

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk



# Too many unused parameters in external/skia/include and this directory.

# getConfig in external/skia/include/core/SkBitmap.h is deprecated.

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

LOCAL_CLANG_CFLAGS += \

    -Wno-unused-parameter \

    -Wno-deprecated-declarations \

    -Wno-gnu-static-float-init



# Only build libhwui when USE_OPENGL_RENDERER is

# defined in the current device/board configuration

ifeq ($(USE_OPENGL_RENDERER),true)

libs/hwui/DisplayList.h

+3 −3
Original line number Diff line number Diff line
@@ -57,9 +57,9 @@ class DisplayListOp; 
class DisplayListRenderer;

class OpenGLRenderer;

class Rect;

class Layer;

class SkiaColorFilter;

class SkiaShader;

struct Layer;

struct SkiaColorFilter;

struct SkiaShader;



class ClipRectOp;

class SaveLayerOp;

libs/hwui/Layer.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ class Caches; 
class OpenGLRenderer;

class DisplayList;

class DeferredDisplayList;

class DeferStateStruct;

struct DeferStateStruct;



/**

 * A layer has dimensions and is backed by an OpenGL texture or FBO.

libs/hwui/OpenGLRenderer.cpp

+3 −1
Original line number Diff line number Diff line
@@ -2239,7 +2239,9 @@ status_t OpenGLRenderer::drawBitmapMesh(SkBitmap* bitmap, int meshWidth, int mes 


    const uint32_t count = meshWidth * meshHeight * 6;



    ColorTextureVertex mesh[count];

    Vector<ColorTextureVertex> meshVector; // TODO: use C++11 unique_ptr

    meshVector.setCapacity(count);

    ColorTextureVertex* mesh = meshVector.editArray();

    ColorTextureVertex* vertex = mesh;



    bool cleanupColors = false;

libs/hwui/OpenGLRenderer.h

+1 −1
Original line number Diff line number Diff line
@@ -1126,7 +1126,7 @@ private: 
    String8 mName;



    friend class DisplayListRenderer;

    friend class Layer;

    friend struct Layer;

    friend class TextSetupFunctor;

    friend class DrawBitmapOp;

    friend class DrawPatchOp;