diff options
Diffstat (limited to 'src/egl')
-rw-r--r-- | src/egl/main/eglapi.c | 30 | ||||
-rw-r--r-- | src/egl/main/eglapi.h | 12 | ||||
-rw-r--r-- | src/egl/main/eglcontext.c | 6 | ||||
-rw-r--r-- | src/egl/main/eglfallbacks.c | 4 | ||||
-rw-r--r-- | src/egl/main/eglimage.c | 6 | ||||
-rw-r--r-- | src/egl/main/eglsync.c | 6 | ||||
-rw-r--r-- | src/egl/main/eglsync.h | 6 |
7 files changed, 0 insertions, 70 deletions
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 5d186c60e5a..a6782d8838b 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -217,9 +217,6 @@ _eglCheckConfig(_EGLDisplay *disp, _EGLConfig *conf, const char *msg) } -#ifdef EGL_KHR_reusable_sync - - static INLINE _EGLDriver * _eglCheckSync(_EGLDisplay *disp, _EGLSync *s, const char *msg) { @@ -234,9 +231,6 @@ _eglCheckSync(_EGLDisplay *disp, _EGLSync *s, const char *msg) } -#endif /* EGL_KHR_reusable_sync */ - - #ifdef EGL_MESA_screen_surface @@ -759,7 +753,6 @@ eglWaitClient(void) EGLBoolean EGLAPIENTRY eglWaitGL(void) { -#ifdef EGL_VERSION_1_2 _EGLThreadInfo *t = _eglGetCurrentThread(); EGLint api_index = t->CurrentAPIIndex; EGLint es_index = _eglConvertApiToIndex(EGL_OPENGL_ES_API); @@ -772,9 +765,6 @@ eglWaitGL(void) ret = eglWaitClient(); t->CurrentAPIIndex = api_index; return ret; -#else - return eglWaitClient(); -#endif } @@ -933,10 +923,8 @@ eglGetProcAddress(const char *procname) #ifdef EGL_MESA_drm_display { "eglGetDRMDisplayMESA", (_EGLProc) eglGetDRMDisplayMESA }, #endif -#ifdef EGL_KHR_image_base { "eglCreateImageKHR", (_EGLProc) eglCreateImageKHR }, { "eglDestroyImageKHR", (_EGLProc) eglDestroyImageKHR }, -#endif /* EGL_KHR_image_base */ #ifdef EGL_NOK_swap_region { "eglSwapBuffersRegionNOK", (_EGLProc) eglSwapBuffersRegionNOK }, #endif @@ -1208,9 +1196,6 @@ eglGetDRMDisplayMESA(int fd) ** EGL 1.2 **/ -#ifdef EGL_VERSION_1_2 - - /** * Specify the client API to use for subsequent calls including: * eglCreateContext() @@ -1309,12 +1294,6 @@ eglReleaseThread(void) } -#endif /* EGL_VERSION_1_2 */ - - -#ifdef EGL_KHR_image_base - - EGLImageKHR EGLAPIENTRY eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attr_list) @@ -1360,12 +1339,6 @@ eglDestroyImageKHR(EGLDisplay dpy, EGLImageKHR image) } -#endif /* EGL_KHR_image_base */ - - -#ifdef EGL_KHR_reusable_sync - - EGLSyncKHR EGLAPIENTRY eglCreateSyncKHR(EGLDisplay dpy, EGLenum type, const EGLint *attrib_list) { @@ -1451,9 +1424,6 @@ eglGetSyncAttribKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *v } -#endif /* EGL_KHR_reusable_sync */ - - #ifdef EGL_NOK_swap_region EGLBoolean EGLAPIENTRY diff --git a/src/egl/main/eglapi.h b/src/egl/main/eglapi.h index 4fcbe40cd4c..8b62c125e83 100644 --- a/src/egl/main/eglapi.h +++ b/src/egl/main/eglapi.h @@ -96,24 +96,18 @@ typedef const char * (*QueryModeStringMESA_t)(_EGLDriver *drv, _EGLDisplay *dpy, #endif /* EGL_MESA_screen_surface */ -#ifdef EGL_VERSION_1_2 typedef _EGLSurface *(*CreatePbufferFromClientBuffer_t)(_EGLDriver *drv, _EGLDisplay *dpy, EGLenum buftype, EGLClientBuffer buffer, _EGLConfig *config, const EGLint *attrib_list); -#endif /* EGL_VERSION_1_2 */ -#ifdef EGL_KHR_image_base typedef _EGLImage *(*CreateImageKHR_t)(_EGLDriver *drv, _EGLDisplay *dpy, _EGLContext *ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attr_list); typedef EGLBoolean (*DestroyImageKHR_t)(_EGLDriver *drv, _EGLDisplay *dpy, _EGLImage *image); -#endif /* EGL_KHR_image_base */ -#ifdef EGL_KHR_reusable_sync typedef _EGLSync *(*CreateSyncKHR_t)(_EGLDriver *drv, _EGLDisplay *dpy, EGLenum type, const EGLint *attrib_list); typedef EGLBoolean (*DestroySyncKHR_t)(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSync *sync); typedef EGLint (*ClientWaitSyncKHR_t)(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSync *sync, EGLint flags, EGLTimeKHR timeout); typedef EGLBoolean (*SignalSyncKHR_t)(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSync *sync, EGLenum mode); typedef EGLBoolean (*GetSyncAttribKHR_t)(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSync *sync, EGLint attribute, EGLint *value); -#endif /* EGL_KHR_reusable_sync */ #ifdef EGL_NOK_swap_region @@ -180,22 +174,16 @@ struct _egl_api QueryModeStringMESA_t QueryModeStringMESA; #endif /* EGL_MESA_screen_surface */ -#ifdef EGL_VERSION_1_2 CreatePbufferFromClientBuffer_t CreatePbufferFromClientBuffer; -#endif -#ifdef EGL_KHR_image_base CreateImageKHR_t CreateImageKHR; DestroyImageKHR_t DestroyImageKHR; -#endif /* EGL_KHR_image_base */ -#ifdef EGL_KHR_reusable_sync CreateSyncKHR_t CreateSyncKHR; DestroySyncKHR_t DestroySyncKHR; ClientWaitSyncKHR_t ClientWaitSyncKHR; SignalSyncKHR_t SignalSyncKHR; GetSyncAttribKHR_t GetSyncAttribKHR; -#endif /* EGL_KHR_reusable_sync */ #ifdef EGL_NOK_swap_region SwapBuffersRegionNOK_t SwapBuffersRegionNOK; 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; diff --git a/src/egl/main/eglfallbacks.c b/src/egl/main/eglfallbacks.c index b4f35d742ae..0b70e929fe0 100644 --- a/src/egl/main/eglfallbacks.c +++ b/src/egl/main/eglfallbacks.c @@ -103,18 +103,14 @@ _eglInitDriverFallbacks(_EGLDriver *drv) drv->API.QueryModeStringMESA = _eglQueryModeStringMESA; #endif /* EGL_MESA_screen_surface */ -#ifdef EGL_KHR_image_base drv->API.CreateImageKHR = NULL; drv->API.DestroyImageKHR = NULL; -#endif /* EGL_KHR_image_base */ -#ifdef EGL_KHR_reusable_sync drv->API.CreateSyncKHR = NULL; drv->API.DestroySyncKHR = NULL; drv->API.ClientWaitSyncKHR = NULL; drv->API.SignalSyncKHR = NULL; drv->API.GetSyncAttribKHR = _eglGetSyncAttribKHR; -#endif /* EGL_KHR_reusable_sync */ #ifdef EGL_MESA_drm_image drv->API.CreateDRMImageMESA = NULL; diff --git a/src/egl/main/eglimage.c b/src/egl/main/eglimage.c index 458a2e424d3..d5deae7595d 100644 --- a/src/egl/main/eglimage.c +++ b/src/egl/main/eglimage.c @@ -34,9 +34,6 @@ #include "egllog.h" -#ifdef EGL_KHR_image_base - - /** * Parse the list of image attributes and return the proper error code. */ @@ -113,6 +110,3 @@ _eglInitImage(_EGLImage *img, _EGLDisplay *dpy) return EGL_TRUE; } - - -#endif /* EGL_KHR_image_base */ diff --git a/src/egl/main/eglsync.c b/src/egl/main/eglsync.c index d8e3ee0c3bf..9d0067caa2d 100644 --- a/src/egl/main/eglsync.c +++ b/src/egl/main/eglsync.c @@ -33,9 +33,6 @@ #include "egllog.h" -#ifdef EGL_KHR_reusable_sync - - /** * Parse the list of sync attributes and return the proper error code. */ @@ -117,6 +114,3 @@ _eglGetSyncAttribKHR(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSync *sync, return EGL_TRUE; } - - -#endif /* EGL_KHR_reusable_sync */ diff --git a/src/egl/main/eglsync.h b/src/egl/main/eglsync.h index 1a56889642e..9708d095cfd 100644 --- a/src/egl/main/eglsync.h +++ b/src/egl/main/eglsync.h @@ -34,9 +34,6 @@ #include "egldisplay.h" -#ifdef EGL_KHR_reusable_sync - - /** * "Base" class for device driver syncs. */ @@ -131,7 +128,4 @@ _eglGetSyncHandle(_EGLSync *sync) } -#endif /* EGL_KHR_reusable_sync */ - - #endif /* EGLSYNC_INCLUDED */ |