diff options
| author | 2017-02-03 02:48:46 +0000 | |
|---|---|---|
| committer | 2017-02-03 02:48:46 +0000 | |
| commit | d1f7b9d02502c8b1b59a8873c74bf26ae288db6d (patch) | |
| tree | 869d350bcec5789b51fe22b22a78ad79d9e68b9e | |
| parent | 64cae76fe0598fcb71e7e49d02fc34c3ab094707 (diff) | |
| parent | f62690cdaf7e59019101b0b4edbaaffe15fd33db (diff) | |
Merge "Fix warning: macro redefined" am: 909ef30a63
am: f62690cdaf
Change-Id: If7255629f0be37af2c08da90e9010423d73decfc
| -rw-r--r-- | libs/gui/tests/SRGB_test.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libs/gui/tests/SRGB_test.cpp b/libs/gui/tests/SRGB_test.cpp index 3b11b974c6..c2640cdceb 100644 --- a/libs/gui/tests/SRGB_test.cpp +++ b/libs/gui/tests/SRGB_test.cpp @@ -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, |