summaryrefslogtreecommitdiffstats
path: root/src/egl/main/eglcontext.c
diff options
context:
space:
mode:
authorChia-I Wu <olv@lunarg.com>2011-12-20 16:28:20 +0800
committerChia-I Wu <olv@lunarg.com>2011-12-20 16:59:09 +0800
commitf957cac772d34b3406be3236b81571e456ee40e8 (patch)
tree1627dcf5771967c0b5677618638d0e31c8cbf63f /src/egl/main/eglcontext.c
parented1ff2acec2cdfe3eace9f4caa6cfe5e0f175534 (diff)
egl: remove #ifdef's for official extensions
There is no point in having them when we distribute eglext.h. As for unofficial extensions, there is a chance that we might remove some of them evetually. Keeping the #ifdef's for now should make that easier.
Diffstat (limited to 'src/egl/main/eglcontext.c')
-rw-r--r--src/egl/main/eglcontext.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/egl/main/eglcontext.c b/src/egl/main/eglcontext.c
index 38e195f0446..17cb03786be 100644
--- a/src/egl/main/eglcontext.c
+++ b/src/egl/main/eglcontext.c
@@ -158,7 +158,6 @@ _eglInitContext(_EGLContext *ctx, _EGLDisplay *dpy, _EGLConfig *conf,
}
-#ifdef EGL_VERSION_1_2
static EGLint
_eglQueryContextRenderBuffer(_EGLContext *ctx)
{
@@ -173,7 +172,6 @@ _eglQueryContextRenderBuffer(_EGLContext *ctx)
rb = surf->RenderBuffer;
return rb;
}
-#endif /* EGL_VERSION_1_2 */
EGLBoolean
@@ -195,14 +193,12 @@ _eglQueryContext(_EGLDriver *drv, _EGLDisplay *dpy, _EGLContext *c,
case EGL_CONTEXT_CLIENT_VERSION:
*value = c->ClientVersion;
break;
-#ifdef EGL_VERSION_1_2
case EGL_CONTEXT_CLIENT_TYPE:
*value = c->ClientAPI;
break;
case EGL_RENDER_BUFFER:
*value = _eglQueryContextRenderBuffer(c);
break;
-#endif /* EGL_VERSION_1_2 */
default:
return _eglError(EGL_BAD_ATTRIBUTE, "eglQueryContext");
}
@@ -310,7 +306,6 @@ _eglCheckMakeCurrent(_EGLContext *ctx, _EGLSurface *draw, _EGLSurface *read)
return _eglError(EGL_BAD_MATCH, "eglMakeCurrent");
switch (ctx->ClientAPI) {
-#ifdef EGL_VERSION_1_4
/* OpenGL and OpenGL ES are conflicting */
case EGL_OPENGL_ES_API:
conflict_api = EGL_OPENGL_API;
@@ -318,7 +313,6 @@ _eglCheckMakeCurrent(_EGLContext *ctx, _EGLSurface *draw, _EGLSurface *read)
case EGL_OPENGL_API:
conflict_api = EGL_OPENGL_ES_API;
break;
-#endif
default:
conflict_api = -1;
break;