jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=db0f9f4ccd45ce38f854f3f86c9c0fc8dccd7285
commit db0f9f4ccd45ce38f854f3f86c9c0fc8dccd7285 Author: Jean-Philippe Andre <[email protected]> Date: Mon Mar 2 19:15:01 2015 +0900 Evas GL: Fix value of GL_COVERAGE_SAMPLES_NV Use the Khronos version from extension EGL_NV_coverage_sample. In the extension multisample_coverage version 4 (since 3/7/2013), there is an explicite note about the name conflict. --- src/lib/evas/Evas_GL.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/lib/evas/Evas_GL.h b/src/lib/evas/Evas_GL.h index eaaaf92..79354da 100644 --- a/src/lib/evas/Evas_GL.h +++ b/src/lib/evas/Evas_GL.h @@ -2226,9 +2226,16 @@ typedef signed int GLfixed; // Changed khronos_int32_t #define GL_COVERAGE_COMPONENT4_NV 0x8ED1 #define GL_COVERAGE_ATTACHMENT_NV 0x8ED2 #define GL_COVERAGE_BUFFERS_NV 0x8ED3 -#ifndef GL_COVERAGE_SAMPLES_NV -#define GL_COVERAGE_SAMPLES_NV 0x8ED4 +#ifdef GL_COVERAGE_SAMPLES_NV +# undef GL_COVERAGE_SAMPLES_NV +/* Extract from the multisample_coverage spec: + * (Note: Earlier versions of this extension included a token + * COVERAGE_SAMPLES_NV that was an alias for SAMPLES/SAMPLES_ARB. This was + * removed to avoid a name collision with a similar COVERAGE_SAMPLES_NV + * token from the NV_coverage_sample extension to OpenGL ES.) + */ #endif +#define GL_COVERAGE_SAMPLES_NV 0x8ED4 #define GL_COVERAGE_ALL_FRAGMENTS_NV 0x8ED5 #define GL_COVERAGE_EDGE_FRAGMENTS_NV 0x8ED6 #define GL_COVERAGE_AUTOMATIC_NV 0x8ED7 --
