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

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

Merge "Fix warning: macro redefined" am: 909ef30a am: f62690cd 

am: d1f7b9d0

Change-Id: Ifa71e97d5ade8685f2f31400afd1727034321b4d
parents 0ad32353 d1f7b9d0

libs/gui/tests/SRGB_test.cpp

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



    // 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[] = {

        EGL_GL_COLORSPACE_KHR, EGL_GL_COLORSPACE_SRGB_KHR,

        EGL_NONE,