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

Commit e021dd66 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix google-explicit-constructor warnings in opengl." am: 9ccba3c0 am: 512fb374 

am: ba50990a

Change-Id: I2ed99ac20752b794149b1e5a6b3b6403210034c5
parents 4bf4908a ba50990a

opengl/libs/EGL/Loader.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ class Loader : public Singleton<Loader> 
        GLESv2      = 0x04

        GLESv2      = 0x04

    };

    };

    struct driver_t {

    struct driver_t {

        driver_t(void* gles);

        explicit driver_t(void* gles);

        ~driver_t();

        ~driver_t();

        status_t set(void* hnd, int32_t api);

        status_t set(void* hnd, int32_t api);

        void* dso[3];

        void* dso[3];

opengl/libs/EGL/egl_object.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -48,7 +48,7 @@ protected: 
    virtual void terminate();

    virtual void terminate();





public:

public:

    egl_object_t(egl_display_t* display);

    explicit egl_object_t(egl_display_t* display);

    void destroy();

    void destroy();





    inline void incRef() { count.fetch_add(1, std::memory_order_relaxed); }

    inline void incRef() { count.fetch_add(1, std::memory_order_relaxed); }
@@ -63,7 +63,7 @@ public: 
    class LocalRef {

    class LocalRef {

        egl_object_t* ref;

        egl_object_t* ref;

        LocalRef();

        LocalRef();

        LocalRef(const LocalRef* rhs);

        explicit LocalRef(const LocalRef* rhs);

    public:

    public:

        ~LocalRef();

        ~LocalRef();

        explicit LocalRef(egl_object_t* rhs);

        explicit LocalRef(egl_object_t* rhs);

opengl/tests/hwc/hwcTestLib.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ class ColorFract { 
class ColorRGB {

class ColorRGB {

  public:

  public:

    ColorRGB(): _r(0.0), _g(0.0), _b(0.0) {};

    ColorRGB(): _r(0.0), _g(0.0), _b(0.0) {};

    ColorRGB(float f): _r(f), _g(f), _b(f) {}; // Gray

    ColorRGB(float f): _r(f), _g(f), _b(f) {}; // Gray, NOLINT(implicit)

    ColorRGB(float r, float g, float b): _r(r), _g(g), _b(b) {};

    ColorRGB(float r, float g, float b): _r(r), _g(g), _b(b) {};

    float r(void) const { return _r; }

    float r(void) const { return _r; }

    float g(void) const { return _g; }

    float g(void) const { return _g; }