From 302eae8ebb9849358736523fe00d95c01706c330 Mon Sep 17 00:00:00 2001 From: Gyusun Yeom Date: Mon, 31 Dec 2018 02:45:45 +0900 Subject: [PATCH] Generate Sources of origin/master updated at Sun Dec 30 17:45:45 GMT 2018 --- include/GL/eglew.h | 19 +++++++++++++++++++ src/glew.c | 29 +++++++++++++++++++++++++++++ src/glewinfo.c | 15 +++++++++++++++ 3 files changed, 63 insertions(+) diff --git a/include/GL/eglew.h b/include/GL/eglew.h index e3ecb12..3c62ca1 100644 --- a/include/GL/eglew.h +++ b/include/GL/eglew.h @@ -2053,6 +2053,21 @@ typedef EGLBoolean ( * PFNEGLEXPORTDMABUFIMAGEQUERYMESAPROC) (EGLDisplay dpy, #endif /* EGL_MESA_platform_surfaceless */ +/* ------------------------- EGL_MESA_query_driver ------------------------- */ + +#ifndef EGL_MESA_query_driver +#define EGL_MESA_query_driver 1 + +typedef const char* ( * PFNEGLGETDISPLAYDRIVERCONFIGPROC) (EGLDisplay dpy, const char* driverName); +typedef const char* ( * PFNEGLGETDISPLAYDRIVERNAMEPROC) (EGLDisplay dpy); + +#define eglGetDisplayDriverConfig EGLEW_GET_FUN(__eglewGetDisplayDriverConfig) +#define eglGetDisplayDriverName EGLEW_GET_FUN(__eglewGetDisplayDriverName) + +#define EGLEW_MESA_query_driver EGLEW_GET_VAR(__EGLEW_MESA_query_driver) + +#endif /* EGL_MESA_query_driver */ + /* -------------------------- EGL_NOK_swap_region -------------------------- */ #ifndef EGL_NOK_swap_region @@ -2706,6 +2721,9 @@ EGLEW_FUN_EXPORT PFNEGLEXPORTDRMIMAGEMESAPROC __eglewExportDRMImageMESA; EGLEW_FUN_EXPORT PFNEGLEXPORTDMABUFIMAGEMESAPROC __eglewExportDMABUFImageMESA; EGLEW_FUN_EXPORT PFNEGLEXPORTDMABUFIMAGEQUERYMESAPROC __eglewExportDMABUFImageQueryMESA; +EGLEW_FUN_EXPORT PFNEGLGETDISPLAYDRIVERCONFIGPROC __eglewGetDisplayDriverConfig; +EGLEW_FUN_EXPORT PFNEGLGETDISPLAYDRIVERNAMEPROC __eglewGetDisplayDriverName; + EGLEW_FUN_EXPORT PFNEGLSWAPBUFFERSREGIONNOKPROC __eglewSwapBuffersRegionNOK; EGLEW_FUN_EXPORT PFNEGLSWAPBUFFERSREGION2NOKPROC __eglewSwapBuffersRegion2NOK; @@ -2848,6 +2866,7 @@ EGLEW_VAR_EXPORT GLboolean __EGLEW_MESA_drm_image; EGLEW_VAR_EXPORT GLboolean __EGLEW_MESA_image_dma_buf_export; EGLEW_VAR_EXPORT GLboolean __EGLEW_MESA_platform_gbm; EGLEW_VAR_EXPORT GLboolean __EGLEW_MESA_platform_surfaceless; +EGLEW_VAR_EXPORT GLboolean __EGLEW_MESA_query_driver; EGLEW_VAR_EXPORT GLboolean __EGLEW_NOK_swap_region; EGLEW_VAR_EXPORT GLboolean __EGLEW_NOK_swap_region2; EGLEW_VAR_EXPORT GLboolean __EGLEW_NOK_texture_from_pixmap; diff --git a/src/glew.c b/src/glew.c index 1aec754..dfb8ea6 100644 --- a/src/glew.c +++ b/src/glew.c @@ -19298,6 +19298,9 @@ PFNEGLEXPORTDRMIMAGEMESAPROC __eglewExportDRMImageMESA = NULL; PFNEGLEXPORTDMABUFIMAGEMESAPROC __eglewExportDMABUFImageMESA = NULL; PFNEGLEXPORTDMABUFIMAGEQUERYMESAPROC __eglewExportDMABUFImageQueryMESA = NULL; +PFNEGLGETDISPLAYDRIVERCONFIGPROC __eglewGetDisplayDriverConfig = NULL; +PFNEGLGETDISPLAYDRIVERNAMEPROC __eglewGetDisplayDriverName = NULL; + PFNEGLSWAPBUFFERSREGIONNOKPROC __eglewSwapBuffersRegionNOK = NULL; PFNEGLSWAPBUFFERSREGION2NOKPROC __eglewSwapBuffersRegion2NOK = NULL; @@ -19440,6 +19443,7 @@ GLboolean __EGLEW_MESA_drm_image = GL_FALSE; GLboolean __EGLEW_MESA_image_dma_buf_export = GL_FALSE; GLboolean __EGLEW_MESA_platform_gbm = GL_FALSE; GLboolean __EGLEW_MESA_platform_surfaceless = GL_FALSE; +GLboolean __EGLEW_MESA_query_driver = GL_FALSE; GLboolean __EGLEW_NOK_swap_region = GL_FALSE; GLboolean __EGLEW_NOK_swap_region2 = GL_FALSE; GLboolean __EGLEW_NOK_texture_from_pixmap = GL_FALSE; @@ -20089,6 +20093,20 @@ static GLboolean _glewInit_EGL_MESA_image_dma_buf_export () #endif /* EGL_MESA_image_dma_buf_export */ +#ifdef EGL_MESA_query_driver + +static GLboolean _glewInit_EGL_MESA_query_driver () +{ + GLboolean r = GL_FALSE; + + r = ((eglGetDisplayDriverConfig = (PFNEGLGETDISPLAYDRIVERCONFIGPROC)glewGetProcAddress((const GLubyte*)"eglGetDisplayDriverConfig")) == NULL) || r; + r = ((eglGetDisplayDriverName = (PFNEGLGETDISPLAYDRIVERNAMEPROC)glewGetProcAddress((const GLubyte*)"eglGetDisplayDriverName")) == NULL) || r; + + return r; +} + +#endif /* EGL_MESA_query_driver */ + #ifdef EGL_NOK_swap_region static GLboolean _glewInit_EGL_NOK_swap_region () @@ -20653,6 +20671,10 @@ GLenum eglewInit (EGLDisplay display) #ifdef EGL_MESA_platform_surfaceless EGLEW_MESA_platform_surfaceless = _glewSearchExtension("EGL_MESA_platform_surfaceless", extStart, extEnd); #endif /* EGL_MESA_platform_surfaceless */ +#ifdef EGL_MESA_query_driver + EGLEW_MESA_query_driver = _glewSearchExtension("EGL_MESA_query_driver", extStart, extEnd); + if (glewExperimental || EGLEW_MESA_query_driver) EGLEW_MESA_query_driver = !_glewInit_EGL_MESA_query_driver(); +#endif /* EGL_MESA_query_driver */ #ifdef EGL_NOK_swap_region EGLEW_NOK_swap_region = _glewSearchExtension("EGL_NOK_swap_region", extStart, extEnd); if (glewExperimental || EGLEW_NOK_swap_region) EGLEW_NOK_swap_region = !_glewInit_EGL_NOK_swap_region(); @@ -31260,6 +31282,13 @@ GLboolean eglewIsSupported (const char* name) ret = EGLEW_MESA_platform_surfaceless; continue; } +#endif +#ifdef EGL_MESA_query_driver + if (_glewStrSame3(&pos, &len, (const GLubyte*)"query_driver", 12)) + { + ret = EGLEW_MESA_query_driver; + continue; + } #endif } if (_glewStrSame2(&pos, &len, (const GLubyte*)"NOK_", 4)) diff --git a/src/glewinfo.c b/src/glewinfo.c index bc42c5a..5c28cfb 100644 --- a/src/glewinfo.c +++ b/src/glewinfo.c @@ -12704,6 +12704,18 @@ static void _glewInfo_EGL_MESA_platform_surfaceless (void) #endif /* EGL_MESA_platform_surfaceless */ +#ifdef EGL_MESA_query_driver + +static void _glewInfo_EGL_MESA_query_driver (void) +{ + glewPrintExt("EGL_MESA_query_driver", EGLEW_MESA_query_driver, eglewIsSupported("EGL_MESA_query_driver"), eglewGetExtension("EGL_MESA_query_driver")); + + glewInfoFunc("eglGetDisplayDriverConfig", eglGetDisplayDriverConfig == NULL); + glewInfoFunc("eglGetDisplayDriverName", eglGetDisplayDriverName == NULL); +} + +#endif /* EGL_MESA_query_driver */ + #ifdef EGL_NOK_swap_region static void _glewInfo_EGL_NOK_swap_region (void) @@ -18017,6 +18029,9 @@ static void eglewInfo () #ifdef EGL_MESA_platform_surfaceless _glewInfo_EGL_MESA_platform_surfaceless(); #endif /* EGL_MESA_platform_surfaceless */ +#ifdef EGL_MESA_query_driver + _glewInfo_EGL_MESA_query_driver(); +#endif /* EGL_MESA_query_driver */ #ifdef EGL_NOK_swap_region _glewInfo_EGL_NOK_swap_region(); #endif /* EGL_NOK_swap_region */