summaryrefslogtreecommitdiff
path: root/src/lib/evas/Evas_GL.h
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-03-02 19:15:01 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-03-02 19:15:01 +0900
commitdb0f9f4ccd45ce38f854f3f86c9c0fc8dccd7285 (patch)
tree056f62e3fc5401fa5c7dde57e8bf424ea0ac0cf4 /src/lib/evas/Evas_GL.h
parent753b2b6e78186f8fa2fcb1d643ac2990a5b7b4eb (diff)
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.
Diffstat (limited to 'src/lib/evas/Evas_GL.h')
-rw-r--r--src/lib/evas/Evas_GL.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/lib/evas/Evas_GL.h b/src/lib/evas/Evas_GL.h
index eaaaf928c4..79354da276 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
2226#define GL_COVERAGE_COMPONENT4_NV 0x8ED1 2226#define GL_COVERAGE_COMPONENT4_NV 0x8ED1
2227#define GL_COVERAGE_ATTACHMENT_NV 0x8ED2 2227#define GL_COVERAGE_ATTACHMENT_NV 0x8ED2
2228#define GL_COVERAGE_BUFFERS_NV 0x8ED3 2228#define GL_COVERAGE_BUFFERS_NV 0x8ED3
2229#ifndef GL_COVERAGE_SAMPLES_NV 2229#ifdef GL_COVERAGE_SAMPLES_NV
2230#define GL_COVERAGE_SAMPLES_NV 0x8ED4 2230# undef GL_COVERAGE_SAMPLES_NV
2231/* Extract from the multisample_coverage spec:
2232 * (Note: Earlier versions of this extension included a token
2233 * COVERAGE_SAMPLES_NV that was an alias for SAMPLES/SAMPLES_ARB. This was
2234 * removed to avoid a name collision with a similar COVERAGE_SAMPLES_NV
2235 * token from the NV_coverage_sample extension to OpenGL ES.)
2236 */
2231#endif 2237#endif
2238#define GL_COVERAGE_SAMPLES_NV 0x8ED4
2232#define GL_COVERAGE_ALL_FRAGMENTS_NV 0x8ED5 2239#define GL_COVERAGE_ALL_FRAGMENTS_NV 0x8ED5
2233#define GL_COVERAGE_EDGE_FRAGMENTS_NV 0x8ED6 2240#define GL_COVERAGE_EDGE_FRAGMENTS_NV 0x8ED6
2234#define GL_COVERAGE_AUTOMATIC_NV 0x8ED7 2241#define GL_COVERAGE_AUTOMATIC_NV 0x8ED7