From 9a275cbecce88b0cbe38f434bd0e09a6632d329b Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Sun, 26 Jan 2020 13:45:51 +0000 Subject: Update to libepoxy 1.5.4. ok jsg@ --- dist/libepoxy/configure.ac | 4 +- dist/libepoxy/meson.build | 4 +- dist/libepoxy/registry/README.md | 13 + dist/libepoxy/registry/egl.xml | 242 ++- dist/libepoxy/registry/gl.xml | 2373 +++++++++++++++++++--- dist/libepoxy/registry/glx.xml | 29 +- dist/libepoxy/registry/wgl.xml | 36 +- dist/libepoxy/src/dispatch_common.c | 38 +- dist/libepoxy/src/dispatch_common.h | 2 +- dist/libepoxy/src/gen_dispatch.py | 26 +- dist/libepoxy/src/meson.build | 6 +- dist/libepoxy/test/Makefile.am | 1 + dist/libepoxy/test/cgl_core.c | 54 + dist/libepoxy/test/cgl_epoxy_api.c | 83 + dist/libepoxy/test/egl_epoxy_api.c | 5 + dist/libepoxy/test/egl_has_extension_nocontext.c | 5 + dist/libepoxy/test/gl_version.c | 89 + dist/libepoxy/test/meson.build | 32 +- 18 files changed, 2719 insertions(+), 323 deletions(-) create mode 100644 dist/libepoxy/test/cgl_core.c create mode 100644 dist/libepoxy/test/cgl_epoxy_api.c create mode 100644 dist/libepoxy/test/gl_version.c (limited to 'dist') diff --git a/dist/libepoxy/configure.ac b/dist/libepoxy/configure.ac index 83b5a5f3f..b0bb452e8 100644 --- a/dist/libepoxy/configure.ac +++ b/dist/libepoxy/configure.ac @@ -22,7 +22,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([libepoxy], - [1.5.2], + [1.5.4], [https://github.com/anholt/libepoxy], [libepoxy]) AC_CONFIG_SRCDIR([Makefile.am]) @@ -157,6 +157,8 @@ if test x$enable_x11 = xno; then AC_MSG_ERROR([GLX support is explicitly enabled, but X11 was disabled]) fi build_glx=no +else + AC_DEFINE([ENABLE_X11], [1], [Whether X11 support is enabled]) fi AM_CONDITIONAL(BUILD_EGL, test x$build_egl = xyes) diff --git a/dist/libepoxy/meson.build b/dist/libepoxy/meson.build index 550910652..91d97928d 100644 --- a/dist/libepoxy/meson.build +++ b/dist/libepoxy/meson.build @@ -1,11 +1,11 @@ -project('libepoxy', 'c', version: '1.5.2', +project('libepoxy', 'c', version: '1.5.4', default_options: [ 'buildtype=debugoptimized', 'c_std=gnu99', 'warning_level=1', ], license: 'MIT', - meson_version: '>= 0.44.0') + meson_version: '>= 0.47.0') epoxy_version = meson.project_version().split('.') epoxy_major_version = epoxy_version[0].to_int() diff --git a/dist/libepoxy/registry/README.md b/dist/libepoxy/registry/README.md index a35d9d9b7..2ade3fe6d 100644 --- a/dist/libepoxy/registry/README.md +++ b/dist/libepoxy/registry/README.md @@ -11,3 +11,16 @@ and copy them into this directory. You should follow these steps, instead: 5. check out the `master` branch and merge the `khronos-registry` branch into it with the appropriate commit message +## Updating the registry XML + +In order to update the registry XML files and retain the history you cannot +simply download the files the [Khronos website](https://khronos.org/registry/OpenGL/index_gl.php) +and copy them into this directory. You should follow these steps, instead: + + 1. check out the `khronos-registry` branch + 2. download the XML files from the Khronos repository + 3. copy them under the `registry` directory + 4. check the result for consistency and commit it + 5. check out the `master` branch and merge the `khronos-registry` branch + into it with the appropriate commit message + diff --git a/dist/libepoxy/registry/egl.xml b/dist/libepoxy/registry/egl.xml index 8fc7f669f..c27f1726b 100644 --- a/dist/libepoxy/registry/egl.xml +++ b/dist/libepoxy/registry/egl.xml @@ -468,8 +468,20 @@ - - + + + + + + + + + + + + + + @@ -499,8 +511,9 @@ - - + + + @@ -535,8 +548,23 @@ - - + + + + + + + + + + + + + + + + + @@ -616,7 +644,9 @@ - + + + @@ -704,8 +734,23 @@ - - + + + + + + + + + + + + + + + + + @@ -713,8 +758,10 @@ - - + + + + @@ -771,7 +818,8 @@ - + + @@ -800,7 +848,22 @@ - + + + + + + + + + + + + + + + + @@ -830,8 +893,54 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -886,6 +995,13 @@ + + + + + + + - - + + @@ -928,6 +1044,12 @@ EGLint config_size EGLint *num_config + + EGLBoolean eglClientSignalSyncEXT + EGLDisplay dpy + EGLSync sync + const EGLAttrib *attrib_list + EGLint eglClientWaitSync EGLDisplay dpy @@ -1210,6 +1332,14 @@ EGLDisplay eglGetDisplay EGLNativeDisplayType display_id + + char *eglGetDisplayDriverConfig + EGLDisplay dpy + + + const char *eglGetDisplayDriverName + EGLDisplay dpy + EGLint eglGetError @@ -1645,6 +1775,11 @@ EGLStreamKHR stream const EGLAttrib *attrib_list + + EGLBoolean eglStreamFlushNV + EGLDisplay dpy + EGLStreamKHR stream + EGLBoolean eglSurfaceAttrib EGLDisplay dpy @@ -1699,6 +1834,12 @@ EGLDisplay dpy EGLSurface surface + + EGLBoolean eglUnsignalSyncEXT + EGLDisplay dpy + EGLSync sync + const EGLAttrib *attrib_list + EGLBoolean eglWaitClient @@ -2103,6 +2244,7 @@ + @@ -2145,6 +2287,13 @@ + + + + + + + @@ -2167,6 +2316,7 @@ + @@ -2219,6 +2369,11 @@ + + + + + @@ -2262,6 +2417,12 @@ + + + + + + @@ -2364,6 +2525,11 @@ + + + + + @@ -2800,6 +2966,12 @@ + + + + + + @@ -2874,6 +3046,11 @@ + + + + + @@ -2914,6 +3091,12 @@ + + + + + + @@ -2925,6 +3108,11 @@ + + + + + @@ -3026,6 +3214,11 @@ + + + + + @@ -3070,5 +3263,20 @@ + + + + + + + + + + + + + + + diff --git a/dist/libepoxy/registry/gl.xml b/dist/libepoxy/registry/gl.xml index 42fce3c1e..84fd26b79 100644 --- a/dist/libepoxy/registry/gl.xml +++ b/dist/libepoxy/registry/gl.xml @@ -1,7 +1,7 @@ -Copyright (c) 2013-2017 The Khronos Group Inc. +Copyright (c) 2013-2018 The Khronos Group Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -27,60 +27,22 @@ can always be found in the Khronos Registry at - #include <stddef.h> #include <KHR/khrplatform.h> - #ifndef GLEXT_64_TYPES_DEFINED -/* This code block is duplicated in glxext.h, so must be protected */ -#define GLEXT_64_TYPES_DEFINED -/* Define int32_t, int64_t, and uint64_t types for UST/MSC */ -/* (as used in the GL_EXT_timer_query extension). */ -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -#include <inttypes.h> -#elif defined(__sun__) || defined(__digital__) -#include <inttypes.h> -#if defined(__STDC__) -#if defined(__arch64__) || defined(_LP64) -typedef long int int64_t; -typedef unsigned long int uint64_t; -#else -typedef long long int int64_t; -typedef unsigned long long int uint64_t; -#endif /* __arch64__ */ -#endif /* __STDC__ */ -#elif defined( __VMS ) || defined(__sgi) -#include <inttypes.h> -#elif defined(__SCO__) || defined(__USLC__) -#include <stdint.h> -#elif defined(__UNIXOS2__) || defined(__SOL64__) -typedef long int int32_t; -typedef long long int int64_t; -typedef unsigned long long int uint64_t; -#elif defined(_WIN32) && defined(__GNUC__) -#include <stdint.h> -#elif defined(_WIN32) -typedef __int32 int32_t; -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; -#else -/* Fallback if nothing above works */ -#include <inttypes.h> -#endif -#endif typedef unsigned int GLenum; typedef unsigned char GLboolean; typedef unsigned int GLbitfield; typedef void GLvoid; - typedef signed char GLbyte; - typedef short GLshort; + typedef khronos_int8_t GLbyte; + typedef khronos_uint8_t GLubyte; + typedef khronos_int16_t GLshort; + typedef khronos_uint16_t GLushort; typedef int GLint; - typedef int GLclampx; - typedef unsigned char GLubyte; - typedef unsigned short GLushort; typedef unsigned int GLuint; + typedef khronos_int32_t GLclampx; typedef int GLsizei; - typedef float GLfloat; - typedef float GLclampf; + typedef khronos_float_t GLfloat; + typedef khronos_float_t GLclampf; typedef double GLdouble; typedef double GLclampd; typedef void *GLeglClientBufferEXT; @@ -92,53 +54,24 @@ typedef void *GLhandleARB; #else typedef unsigned int GLhandleARB; #endif - typedef unsigned short GLhalfARB; - typedef unsigned short GLhalf; - typedef GLint GLfixed; - typedef ptrdiff_t GLintptr; - typedef ptrdiff_t GLsizeiptr; - typedef int64_t GLint64; - typedef uint64_t GLuint64; - typedef ptrdiff_t GLintptrARB; - typedef ptrdiff_t GLsizeiptrARB; - typedef int64_t GLint64EXT; - typedef uint64_t GLuint64EXT; + typedef khronos_uint16_t GLhalf; + typedef khronos_uint16_t GLhalfARB; + typedef khronos_int32_t GLfixed; + typedef khronos_intptr_t GLintptr; + typedef khronos_intptr_t GLintptrARB; + typedef khronos_ssize_t GLsizeiptr; + typedef khronos_ssize_t GLsizeiptrARB; + typedef khronos_int64_t GLint64; + typedef khronos_int64_t GLint64EXT; + typedef khronos_uint64_t GLuint64; + typedef khronos_uint64_t GLuint64EXT; typedef struct __GLsync *GLsync; struct _cl_context; struct _cl_event; typedef void ( *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); typedef void ( *GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); typedef void ( *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); - - typedef khronos_int32_t GLclampx; - - typedef khronos_int8_t GLbyte; - typedef khronos_uint8_t GLubyte; - typedef khronos_float_t GLfloat; - typedef khronos_float_t GLclampf; - typedef khronos_int32_t GLfixed; - typedef khronos_int64_t GLint64; - typedef khronos_uint64_t GLuint64; - typedef khronos_intptr_t GLintptr; - typedef khronos_ssize_t GLsizeiptr; - - typedef khronos_int8_t GLbyte; - typedef khronos_uint8_t GLubyte; - typedef khronos_float_t GLfloat; - typedef khronos_float_t GLclampf; - typedef khronos_int32_t GLfixed; - typedef khronos_int64_t GLint64; - typedef khronos_uint64_t GLuint64; - typedef khronos_int64_t GLint64EXT; - typedef khronos_uint64_t GLuint64EXT; - typedef khronos_intptr_t GLintptr; - typedef khronos_ssize_t GLsizeiptr; - - - typedef khronos_uint8_t GLubyte; - typedef khronos_float_t GLfloat; - typedef khronos_intptr_t GLintptr; - typedef khronos_ssize_t GLsizeiptr; + typedef void ( *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,void *userParam); typedef unsigned short GLhalfNV; @@ -149,6 +82,636 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -199,11 +762,15 @@ typedef unsigned int GLhandleARB; + + + - + + @@ -265,6 +832,7 @@ typedef unsigned int GLhandleARB; + @@ -285,23 +853,22 @@ typedef unsigned int GLhandleARB; - + + + + + - - - - - - - - + + + @@ -456,6 +1023,44 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -473,6 +1078,14 @@ typedef unsigned int GLhandleARB; + + + + + + + + @@ -486,6 +1099,9 @@ typedef unsigned int GLhandleARB; + + + @@ -501,6 +1117,7 @@ typedef unsigned int GLhandleARB; + @@ -537,6 +1154,7 @@ typedef unsigned int GLhandleARB; + @@ -550,11 +1168,20 @@ typedef unsigned int GLhandleARB; + + + + + + + + + @@ -566,6 +1193,7 @@ typedef unsigned int GLhandleARB; + @@ -778,6 +1406,7 @@ typedef unsigned int GLhandleARB; + @@ -789,6 +1418,7 @@ typedef unsigned int GLhandleARB; + @@ -798,10 +1428,17 @@ typedef unsigned int GLhandleARB; + + + + + + + @@ -827,6 +1464,8 @@ typedef unsigned int GLhandleARB; + + @@ -835,6 +1474,7 @@ typedef unsigned int GLhandleARB; + @@ -842,6 +1482,7 @@ typedef unsigned int GLhandleARB; + @@ -855,16 +1496,19 @@ typedef unsigned int GLhandleARB; + + + @@ -887,6 +1531,7 @@ typedef unsigned int GLhandleARB; + @@ -895,6 +1540,8 @@ typedef unsigned int GLhandleARB; + + @@ -909,6 +1556,7 @@ typedef unsigned int GLhandleARB; + @@ -936,6 +1584,7 @@ typedef unsigned int GLhandleARB; + @@ -961,9 +1610,11 @@ typedef unsigned int GLhandleARB; + + @@ -975,20 +1626,98 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1000,14 +1729,20 @@ typedef unsigned int GLhandleARB; + + + + + + @@ -1025,6 +1760,7 @@ typedef unsigned int GLhandleARB; + @@ -1036,6 +1772,8 @@ typedef unsigned int GLhandleARB; + + @@ -1074,23 +1812,35 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + @@ -1099,6 +1849,11 @@ typedef unsigned int GLhandleARB; + + + + + @@ -1109,6 +1864,13 @@ typedef unsigned int GLhandleARB; + + + + + + + @@ -1128,9 +1890,18 @@ typedef unsigned int GLhandleARB; + + + + + + + + + @@ -1142,13 +1913,23 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + @@ -1156,13 +1937,20 @@ typedef unsigned int GLhandleARB; + + + + + + + @@ -1435,11 +2223,7 @@ typedef unsigned int GLhandleARB; - - - - - + @@ -1588,18 +2372,30 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + @@ -1724,6 +2520,7 @@ typedef unsigned int GLhandleARB; + @@ -1791,7 +2588,6 @@ typedef unsigned int GLhandleARB; - @@ -1803,6 +2599,20 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + @@ -1838,6 +2648,83 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2068,6 +2955,22 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + @@ -2126,7 +3029,9 @@ typedef unsigned int GLhandleARB; + + @@ -2369,6 +3274,8 @@ typedef unsigned int GLhandleARB; + + @@ -2386,10 +3293,24 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + @@ -2467,6 +3388,7 @@ typedef unsigned int GLhandleARB; + @@ -2516,11 +3438,15 @@ typedef unsigned int GLhandleARB; - + + + + + @@ -2571,6 +3497,14 @@ typedef unsigned int GLhandleARB; + + + + + + + + @@ -2728,6 +3662,20 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + @@ -2766,6 +3714,7 @@ typedef unsigned int GLhandleARB; + @@ -2821,17 +3770,21 @@ typedef unsigned int GLhandleARB; - + + + + + + - - + @@ -2870,7 +3823,6 @@ typedef unsigned int GLhandleARB; - @@ -3054,24 +4006,6 @@ typedef unsigned int GLhandleARB; - - - - - - - - - - - - - - - - - - @@ -3086,6 +4020,87 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3384,6 +4399,182 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3416,11 +4607,20 @@ typedef unsigned int GLhandleARB; - + - - + + + + + + + + + + + @@ -3450,7 +4650,7 @@ typedef unsigned int GLhandleARB; - + @@ -3467,15 +4667,6 @@ typedef unsigned int GLhandleARB; - - - - - - - - - @@ -3540,10 +4731,24 @@ typedef unsigned int GLhandleARB; + + + + + + + + + + + + + + @@ -3675,6 +4880,7 @@ typedef unsigned int GLhandleARB; + @@ -5779,7 +6985,8 @@ typedef unsigned int GLhandleARB; - + + @@ -6492,6 +7699,7 @@ typedef unsigned int GLhandleARB; + @@ -7832,6 +9040,7 @@ typedef unsigned int GLhandleARB; + @@ -8652,7 +9861,22 @@ typedef unsigned int GLhandleARB; - + + + + + + + + + + + + + + + + @@ -8901,7 +10125,8 @@ typedef unsigned int GLhandleARB; - + + @@ -8911,7 +10136,7 @@ typedef unsigned int GLhandleARB; - + @@ -9460,7 +10685,13 @@ typedef unsigned int GLhandleARB; - + + + + + + + @@ -9664,7 +10895,7 @@ typedef unsigned int GLhandleARB; - + @@ -9827,7 +11058,7 @@ typedef unsigned int GLhandleARB; - + @@ -9836,7 +11067,36 @@ typedef unsigned int GLhandleARB; - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -9966,18 +11226,32 @@ typedef unsigned int GLhandleARB; - + + + + + + + + + + + + + + - + - + + @@ -9988,9 +11262,39 @@ typedef unsigned int GLhandleARB; - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -10019,7 +11323,28 @@ typedef unsigned int GLhandleARB; - + + + + + + + + + + + + + + + + + + + + + + @@ -10050,7 +11375,8 @@ typedef unsigned int GLhandleARB; - + +