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

Commit f62690cd authored by Yunlian Jiang's avatar Yunlian Jiang Committed by android-build-merger
Browse files

Merge "Fix warning: macro redefined" 

am: 909ef30a

Change-Id: Ia1b083546fe41a81acf83e0cb0b8921700aa1bfa
parents 9046024e 909ef30a

libs/gui/tests/SRGB_test.cpp

+0 −3
Original line number Original line Diff line number Diff line
@@ -435,9 +435,6 @@ TEST_F(SRGBTest, DISABLED_RenderToSRGBSurface) { 
    ASSERT_EQ(NO_ERROR, mCpuConsumer->unlockBuffer(mLockedBuffer));

    ASSERT_EQ(NO_ERROR, mCpuConsumer->unlockBuffer(mLockedBuffer));





    // Switch to SRGB window surface

    // Switch to SRGB window surface

#define EGL_GL_COLORSPACE_KHR      EGL_VG_COLORSPACE

#define EGL_GL_COLORSPACE_SRGB_KHR EGL_VG_COLORSPACE_sRGB



    static const int srgbAttribs[] = {

    static const int srgbAttribs[] = {

        EGL_GL_COLORSPACE_KHR, EGL_GL_COLORSPACE_SRGB_KHR,

        EGL_GL_COLORSPACE_KHR, EGL_GL_COLORSPACE_SRGB_KHR,

        EGL_NONE,

        EGL_NONE,