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

Commit 512fb374 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

Change-Id: Icf73c478090ef837c24aa3b4b75152ad4eef3480
parents 1b080b15 9ccba3c0

opengl/libs/EGL/Loader.h

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

    };

    struct driver_t {

        driver_t(void* gles);

        explicit driver_t(void* gles);

        ~driver_t();

        status_t set(void* hnd, int32_t api);

        void* dso[3];

opengl/libs/EGL/egl_object.h

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



public:

    egl_object_t(egl_display_t* display);

    explicit egl_object_t(egl_display_t* display);

    void destroy();



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

        egl_object_t* ref;

        LocalRef();

        LocalRef(const LocalRef* rhs);

        explicit LocalRef(const LocalRef* rhs);

    public:

        ~LocalRef();

        explicit LocalRef(egl_object_t* rhs);

opengl/tests/hwc/hwcTestLib.h

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

  public:

    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) {};

    float r(void) const { return _r; }

    float g(void) const { return _g; }