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

Commit 303b9a51 authored by Dan Stoza's avatar Dan Stoza
Browse files

libui: Enable -Weverything and -Werror 

Enables -Weverything and -Werror, with just a few exceptions for
warnings we can't (or shouldn't need to) work around.

Change-Id: I470a267e9b1c373f2d5c960f005c3b0e02b2db63
parent 456d35b3

include/ui/Fence.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public: 
    // before the fence signals then -ETIME is returned.  A timeout of

    // TIMEOUT_NEVER may be used to indicate that the call should wait

    // indefinitely for the fence to signal.

    status_t wait(unsigned int timeout);

    status_t wait(int timeout);



    // waitForever is a convenience function for waiting forever for a fence to

    // signal (just like wait(TIMEOUT_NEVER)), but issuing an error to the

include/ui/GraphicBuffer.h

+26 −19
Original line number Diff line number Diff line
@@ -72,11 +72,13 @@ public: 
    GraphicBuffer();



    // creates w * h buffer

    GraphicBuffer(int w, int h, PixelFormat format, int usage);

    GraphicBuffer(uint32_t inWidth, uint32_t inHeight, PixelFormat inFormat,

            uint32_t inUsage);



    // create a buffer from an existing handle

    GraphicBuffer(int w, int h, PixelFormat format, int usage,

            int stride, native_handle_t* handle, bool keepOwnership);

    GraphicBuffer(uint32_t inWidth, uint32_t inHeight, PixelFormat inFormat,

            uint32_t inUsage, uint32_t inStride, native_handle_t* inHandle,

            bool keepOwnership);



    // create a buffer from an existing ANativeWindowBuffer

    GraphicBuffer(ANativeWindowBuffer* buffer, bool keepOwnership);
@@ -84,26 +86,31 @@ public: 
    // return status

    status_t initCheck() const;



    int getWidth() const                { return width; }

    int getHeight() const               { return height; }

    int getStride() const               { return stride; }

    int getUsage() const                { return usage; }

    uint32_t getWidth() const           { return static_cast<uint32_t>(width); }

    uint32_t getHeight() const          { return static_cast<uint32_t>(height); }

    uint32_t getStride() const          { return static_cast<uint32_t>(stride); }

    uint32_t getUsage() const           { return static_cast<uint32_t>(usage); }

    PixelFormat getPixelFormat() const  { return format; }

    Rect getBounds() const              { return Rect(width, height); }

    uint64_t getId() const              { return mId; }



    status_t reallocate(int w, int h, PixelFormat f, int usage);

    status_t reallocate(uint32_t inWidth, uint32_t inHeight,

            PixelFormat inFormat, uint32_t inUsage);



    status_t lock(uint32_t usage, void** vaddr);

    status_t lock(uint32_t usage, const Rect& rect, void** vaddr);

    status_t lock(uint32_t inUsage, void** vaddr);

    status_t lock(uint32_t inUsage, const Rect& rect, void** vaddr);

    // For HAL_PIXEL_FORMAT_YCbCr_420_888

    status_t lockYCbCr(uint32_t usage, android_ycbcr *ycbcr);

    status_t lockYCbCr(uint32_t usage, const Rect& rect, android_ycbcr *ycbcr);

    status_t lockYCbCr(uint32_t inUsage, android_ycbcr *ycbcr);

    status_t lockYCbCr(uint32_t inUsage, const Rect& rect,

            android_ycbcr *ycbcr);

    status_t unlock();

    status_t lockAsync(uint32_t usage, void** vaddr, int fenceFd);

    status_t lockAsync(uint32_t usage, const Rect& rect, void** vaddr, int fenceFd);

    status_t lockAsyncYCbCr(uint32_t usage, android_ycbcr *ycbcr, int fenceFd);

    status_t lockAsyncYCbCr(uint32_t usage, const Rect& rect, android_ycbcr *ycbcr, int fenceFd);

    status_t lockAsync(uint32_t inUsage, void** vaddr, int fenceFd);

    status_t lockAsync(uint32_t inUsage, const Rect& rect, void** vaddr,

            int fenceFd);

    status_t lockAsyncYCbCr(uint32_t inUsage, android_ycbcr *ycbcr,

            int fenceFd);

    status_t lockAsyncYCbCr(uint32_t inUsage, const Rect& rect,

            android_ycbcr *ycbcr, int fenceFd);

    status_t unlockAsync(int *fenceFd);



    ANativeWindowBuffer* getNativeBuffer() const;
@@ -143,8 +150,8 @@ private: 
    GraphicBuffer& operator = (const GraphicBuffer& rhs);

    const GraphicBuffer& operator = (const GraphicBuffer& rhs) const;



    status_t initSize(uint32_t w, uint32_t h, PixelFormat format, 

            uint32_t usage);

    status_t initSize(uint32_t inWidth, uint32_t inHeight, PixelFormat inFormat,

            uint32_t inUsage);



    void free_handle();

include/ui/GraphicBufferAllocator.h

+20 −21
Original line number Diff line number Diff line
@@ -61,9 +61,8 @@ public: 


    static inline GraphicBufferAllocator& get() { return getInstance(); }





    status_t alloc(uint32_t w, uint32_t h, PixelFormat format, int usage,

            buffer_handle_t* handle, int32_t* stride);

    status_t alloc(uint32_t w, uint32_t h, PixelFormat format, uint32_t usage,

            buffer_handle_t* handle, uint32_t* stride);



    status_t free(buffer_handle_t handle);
@@ -72,9 +71,9 @@ public: 


private:

    struct alloc_rec_t {

        uint32_t w;

        uint32_t h;

        uint32_t s;

        uint32_t width;

        uint32_t height;

        uint32_t stride;

        PixelFormat format;

        uint32_t usage;

        size_t size;

include/ui/GraphicBufferMapper.h

+7 −6
Original line number Diff line number Diff line
@@ -43,18 +43,19 @@ public: 
    status_t unregisterBuffer(buffer_handle_t handle);



    status_t lock(buffer_handle_t handle,

            int usage, const Rect& bounds, void** vaddr);

            uint32_t usage, const Rect& bounds, void** vaddr);



    status_t lockYCbCr(buffer_handle_t handle,

            int usage, const Rect& bounds, android_ycbcr *ycbcr);

            uint32_t usage, const Rect& bounds, android_ycbcr *ycbcr);



    status_t unlock(buffer_handle_t handle);



    status_t lockAsync(buffer_handle_t handle,

            int usage, const Rect& bounds, void** vaddr, int fenceFd);

            uint32_t usage, const Rect& bounds, void** vaddr, int fenceFd);



    status_t lockAsyncYCbCr(buffer_handle_t handle,

            int usage, const Rect& bounds, android_ycbcr *ycbcr, int fenceFd);

            uint32_t usage, const Rect& bounds, android_ycbcr *ycbcr,

            int fenceFd);



    status_t unlockAsync(buffer_handle_t handle, int *fenceFd);

include/ui/PixelFormat.h

+2 −5
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ 
#ifndef UI_PIXELFORMAT_H

#define UI_PIXELFORMAT_H



#include <stdint.h>

#include <sys/types.h>

#include <utils/Errors.h>

#include <hardware/hardware.h>



namespace android {
@@ -69,8 +66,8 @@ enum { 


typedef int32_t PixelFormat;



ssize_t bytesPerPixel(PixelFormat format);

ssize_t bitsPerPixel(PixelFormat format);

uint32_t bytesPerPixel(PixelFormat format);

uint32_t bitsPerPixel(PixelFormat format);



}; // namespace android